diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 6165cd3688b..33abd0e3f56 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "12.0.0")                             # The IDE version.
+set(IDE_VERSION "12.0.1")                             # The IDE version.
 set(IDE_VERSION_COMPAT "12.0.0")                      # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "12.0.0")                     # The IDE display version.
+set(IDE_VERSION_DISPLAY "12.0.1")                     # The IDE display version.
 set(IDE_COPYRIGHT_YEAR "2023")                        # The IDE current copyright year.
 
 set(IDE_SETTINGSVARIANT "QtProject")                  # The IDE settings variation.
diff --git a/dist/changelog/changes-12.0.0.md b/dist/changelog/changes-12.0.0.md
index 3d8608f2da9..84110f0ad81 100644
--- a/dist/changelog/changes-12.0.0.md
+++ b/dist/changelog/changes-12.0.0.md
@@ -371,6 +371,7 @@ Credits for these changes go to:
 --------------------------------
 Aleksei German  
 Alessandro Portale  
+Alexandre Laurent  
 Ali Kianian  
 Amr Essam  
 Andre Hartmann  
@@ -393,6 +394,7 @@ Johanna Vanhatapio
 Johnny Jazeix  
 Jonas Karlsson  
 Jussi Witick  
+Karim Abdelrahman  
 Knud Dollereder  
 Leena Miettinen  
 Ludovic Le Brun  
@@ -402,6 +404,7 @@ Marcus Tillmanns
 Mats Honkamaa  
 Mehdi Salem  
 Miikka Heikkinen  
+Mike Chen  
 Olivier De Cannière  
 Olivier Delaune  
 Orgad Shaneh  
diff --git a/dist/changelog/changes-12.0.1.md b/dist/changelog/changes-12.0.1.md
new file mode 100644
index 00000000000..fbe70abb89d
--- /dev/null
+++ b/dist/changelog/changes-12.0.1.md
@@ -0,0 +1,116 @@
+Qt Creator 12.0.1
+=================
+
+Qt Creator version 12.0.1 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 origin/v12.0.0..v12.0.1
+
+General
+-------
+
+* Fixed opening files with drag and drop on Qt Creator
+  ([QTCREATORBUG-29961](https://bugreports.qt.io/browse/QTCREATORBUG-29961))
+
+Editing
+-------
+
+### C++
+
+* Fixed a crash while parsing
+  ([QTCREATORBUG-29847](https://bugreports.qt.io/browse/QTCREATORBUG-29847))
+* Fixed a freeze when hovering over a class declaration
+  ([QTCREATORBUG-29975](https://bugreports.qt.io/browse/QTCREATORBUG-29975))
+* Fixed the renaming of virtual functions
+* Fixed `Select Block Up` for string literals
+  ([QTCREATORBUG-29844](https://bugreports.qt.io/browse/QTCREATORBUG-29844))
+* Fixed the conversion between comment styles for certain indented comments
+* Clang Format
+    * Fixed the indentation after multi-byte UTF-8 characters
+      ([QTCREATORBUG-29927](https://bugreports.qt.io/browse/QTCREATORBUG-29927))
+
+### Widget Designer
+
+* Fixed that the buttons for editing signals and slots and editing buddies
+  were switched
+  ([QTCREATORBUG-30017](https://bugreports.qt.io/browse/QTCREATORBUG-30017))
+
+Projects
+--------
+
+* Fixed the restoring of custom Kit data
+  ([QTCREATORBUG-29970](https://bugreports.qt.io/browse/QTCREATORBUG-29970))
+* Fixed overlapping labels in the target selector
+  ([QTCREATORBUG-29990](https://bugreports.qt.io/browse/QTCREATORBUG-29990))
+* Fixed the label for `Custom Executable` run configurations
+  ([QTCREATORBUG-29983](https://bugreports.qt.io/browse/QTCREATORBUG-29983))
+
+### CMake
+
+* Fixed a crash when opening projects
+  ([QTCREATORBUG-29965](https://bugreports.qt.io/browse/QTCREATORBUG-29965))
+* Fixed a crash when editing CMake files without a project
+  ([QTCREATORBUG-30023](https://bugreports.qt.io/browse/QTCREATORBUG-30023))
+* Fixed that directories were marked as invalid for the `Staging Directory`
+  ([QTCREATORBUG-29997](https://bugreports.qt.io/browse/QTCREATORBUG-29997))
+
+### Qbs
+
+* Fixed a crash when parsing projects
+
+Analyzer
+--------
+
+### Valgrind
+
+* Fixed stopping the Valgrind process
+  ([QTCREATORBUG-29948](https://bugreports.qt.io/browse/QTCREATORBUG-29948))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Fixed that empty blame annotations are shown after saving a file outside of
+  the version control directory
+  ([QTCREATORBUG-29991](https://bugreports.qt.io/browse/QTCREATORBUG-29991))
+
+Platforms
+---------
+
+### Linux
+
+* Added an error dialog for errors when loading the Qt platform plugin
+  ([QTCREATORBUG-30004](https://bugreports.qt.io/browse/QTCREATORBUG-30004))
+
+### Boot2Qt
+
+* Fixed deployment on Windows
+  ([QTCREATORBUG-29971](https://bugreports.qt.io/browse/QTCREATORBUG-29971))
+
+### MCU
+
+* Fixed `Replace existing kits` after changing MCU SDK path
+  ([QTCREATORBUG-29960](https://bugreports.qt.io/browse/QTCREATORBUG-29960))
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+Andre Hartmann  
+Artem Sokolovskii  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+Eike Ziller  
+Friedemann Kleint  
+Jaroslaw Kobus  
+Marcus Tillmanns  
+Orgad Shaneh  
+Robert Löhning  
+Samuli Piippo  
+Tor Arne Vestbø  
+Yasser Grimes  
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 79d0b0d5cf2..6007489259e 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -4,10 +4,10 @@ import qbs.FileInfo
 import qbs.Utilities
 
 Module {
-    property string qtcreator_display_version: '12.0.0'
+    property string qtcreator_display_version: '12.0.1'
     property string ide_version_major: '12'
     property string ide_version_minor: '0'
-    property string ide_version_release: '0'
+    property string ide_version_release: '1'
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
                                        + ide_version_release
 
diff --git a/share/qtcreator/debugger/pdbbridge.py b/share/qtcreator/debugger/pdbbridge.py
index 228f4c8c1fc..a245a588140 100644
--- a/share/qtcreator/debugger/pdbbridge.py
+++ b/share/qtcreator/debugger/pdbbridge.py
@@ -704,13 +704,20 @@ class QtcInternalDumper():
 
     def runit(self):
         print('DIR: %s' % dir())
+        print('ARGV: %s' % sys.argv)
         if sys.argv[0] == '-c':
             sys.argv = sys.argv[2:]
         else:
             sys.argv = sys.argv[1:]
-        print('ARGV: %s' % sys.argv)
         mainpyfile = sys.argv[0]     # Get script filename
         sys.path.append(os.path.dirname(mainpyfile))
+        # Delete arguments superfluous to the inferior
+        try:
+            args_pos = sys.argv.index("--")
+            sys.argv = [sys.argv[0]] + sys.argv[args_pos + 1:]
+        except ValueError:
+            pass
+        print('INFERIOR ARGV: %s' % sys.argv)
         print('MAIN: %s' % mainpyfile)
 
         while True:
diff --git a/src/app/main.cpp b/src/app/main.cpp
index c7857dcd9d9..5ac1f6727a0 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -478,6 +478,53 @@ bool startCrashpad(const QString &libexecPath, bool crashReportingEnabled)
 }
 #endif
 
+class ShowInGuiHandler
+{
+public:
+    ShowInGuiHandler()
+    {
+        instance = this;
+        oldHandler = qInstallMessageHandler(log);
+    }
+    ~ShowInGuiHandler() { qInstallMessageHandler(oldHandler); };
+
+private:
+    static void log(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+    {
+        instance->messages += msg;
+        if (type == QtFatalMsg) {
+            // Show some kind of GUI with collected messages before exiting.
+            // For Windows, Qt already uses a dialog.
+            if (Utils::HostOsInfo::isLinuxHost()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 5, 3)) \
+    || (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 1))
+                // Information about potentially missing libxcb-cursor0 is printed by Qt since Qt 6.5.3 and Qt 6.6.1
+                // Add it manually for other versions >= 6.5.0
+                instance->messages.prepend("From 6.5.0, xcb-cursor0 or libxcb-cursor0 is needed to "
+                                           "load the Qt xcb platform plugin.");
+#endif
+                if (QFile::exists("/usr/bin/xmessage"))
+                    QProcess::startDetached("/usr/bin/xmessage", {instance->messages.join("\n")});
+            } else if (Utils::HostOsInfo::isMacHost()) {
+                QProcess::startDetached("/usr/bin/osascript",
+                                        {"-e",
+                                         "display dialog \""
+                                             + instance->messages.join("\n").replace("\"", "\\\"")
+                                             + "\" buttons \"OK\" with title \""
+                                             + Core::Constants::IDE_DISPLAY_NAME
+                                             + " Failed to Start\""});
+            }
+        }
+        instance->oldHandler(type, context, msg);
+    };
+
+    static ShowInGuiHandler *instance;
+    QStringList messages;
+    QtMessageHandler oldHandler = nullptr;
+};
+
+ShowInGuiHandler *ShowInGuiHandler::instance = nullptr;
+
 int main(int argc, char **argv)
 {
     Restarter restarter(argc, argv);
@@ -600,9 +647,13 @@ int main(int argc, char **argv)
 
     int numberOfArguments = static_cast<int>(options.appArguments.size());
 
+    // create a custom Qt message handler that shows messages in a bare bones UI
+    // if creation of the QGuiApplication fails.
+    auto handler = std::make_unique<ShowInGuiHandler>();
     std::unique_ptr<SharedTools::QtSingleApplication>
         appPtr(SharedTools::createApplication(QLatin1String(Core::Constants::IDE_DISPLAY_NAME),
                                               numberOfArguments, options.appArguments.data()));
+    handler.reset();
     SharedTools::QtSingleApplication &app = *appPtr;
     QCoreApplication::setApplicationName(Core::Constants::IDE_CASED_ID);
     QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
diff --git a/src/libs/3rdparty/cplusplus/Lexer.cpp b/src/libs/3rdparty/cplusplus/Lexer.cpp
index deafe432b6a..92cfc5d6ecf 100644
--- a/src/libs/3rdparty/cplusplus/Lexer.cpp
+++ b/src/libs/3rdparty/cplusplus/Lexer.cpp
@@ -838,16 +838,16 @@ void Lexer::scanRawStringLiteral(Token *tok, unsigned char hint)
 
 bool Lexer::scanUntilRawStringLiteralEndPrecise()
 {
-    int matchLen = 0;
+    QByteArray slidingWindow;
+    slidingWindow.reserve(_expectedRawStringSuffix.size());
     while (_yychar) {
-        if (_yychar == _expectedRawStringSuffix.at(matchLen)) {
-            if (++matchLen == _expectedRawStringSuffix.length()) {
-                _expectedRawStringSuffix.clear();
-                yyinp();
-                return true;
-            }
-        } else {
-            matchLen = 0;
+        slidingWindow.append(_yychar);
+        if (slidingWindow.size() > _expectedRawStringSuffix.size())
+            slidingWindow.remove(0, 1);
+        if (slidingWindow == _expectedRawStringSuffix) {
+            _expectedRawStringSuffix.clear();
+            yyinp();
+            return true;
         }
         yyinp();
     }
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
index 395556777dd..30e3fe0be1b 100644
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@ -4946,8 +4946,8 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
             CompoundExpressionAST *ast = new (_pool) CompoundExpressionAST;
             ast->lparen_token = consumeToken();
             StatementAST *statement = nullptr;
-            parseCompoundStatement(statement);
-            ast->statement = statement->asCompoundStatement();
+            if (parseCompoundStatement(statement))
+                ast->statement = statement->asCompoundStatement();
             match(T_RPAREN, &ast->rparen_token);
             node = ast;
             return true;
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 8d690f3bd46..2c7e1ebbf31 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -41,6 +41,7 @@ add_qtc_library(Sqlite
     constraints.h
     createtablesqlstatementbuilder.h
     lastchangedrowid.h
+    sqlite3_fwd.h
     sqlitealgorithms.h
     sqlitebasestatement.cpp sqlitebasestatement.h
     sqlitecolumn.h
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 73d37a2eace..f17f49b95b1 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -1838,6 +1838,8 @@ QAction *BoolAspect::action()
     connect(act, &QAction::triggered, this, [this](bool newValue) {
         setValue(newValue);
     });
+    connect(this, &BoolAspect::changed, act, [act, this] { act->setChecked(m_internal); });
+
     return act;
 }
 
diff --git a/src/plugins/boot2qt/device-detection/devicedetector.cpp b/src/plugins/boot2qt/device-detection/devicedetector.cpp
index 10faa4fb3ca..abe06bc566b 100644
--- a/src/plugins/boot2qt/device-detection/devicedetector.cpp
+++ b/src/plugins/boot2qt/device-detection/devicedetector.cpp
@@ -9,6 +9,7 @@
 #include "../qdbutils.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/qtcassert.h>
 
@@ -85,6 +86,8 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
         device->settings()->displayName.setValue(name);
         device->setType(Qdb::Constants::QdbLinuxOsType);
         device->setMachineType(IDevice::Hardware);
+        device->setExtraData(ProjectExplorer::Constants::SUPPORTS_RSYNC, true);
+        device->setExtraData(ProjectExplorer::Constants::SUPPORTS_SFTP, true);
 
         const QString ipAddress = info["ipAddress"];
         device->setupDefaultNetworkSettings(ipAddress);
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index de1a7557c83..1b2887a2044 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -124,7 +124,11 @@ public:
                    && prj->hasMakeInstallEquivalent();
         });
         addInitialStep(Qdb::Constants::QdbStopApplicationStepId);
+#ifdef Q_OS_WIN
+        addInitialStep(RemoteLinux::Constants::DirectUploadStepId);
+#else
         addInitialStep(RemoteLinux::Constants::GenericDeployStepId);
+#endif
     }
 };
 
diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 565c8306a0b..09fa96c6e17 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -1139,14 +1139,15 @@ void ClangdClient::gatherHelpItemForTooltip(const HoverRequest::Response &hoverR
                 for (const QString &line : lines) {
                     const QString possibleFilePath = line.simplified();
                     const auto looksLikeFilePath = [&] {
-                        if (possibleFilePath.length() < 3)
+                        if (possibleFilePath.length() < 4)
                             return false;
                         if (osType() == OsTypeWindows) {
-                            if (possibleFilePath.startsWith(R"(\\)"))
+                            if (possibleFilePath.startsWith(R"(\\\\)"))
                                 return true;
                             return possibleFilePath.front().isLetter()
                                     && possibleFilePath.at(1) == ':'
-                                    && possibleFilePath.at(2) == '\\';
+                                    && possibleFilePath.at(2) == '\\'
+                                    && possibleFilePath.at(3) == '\\';
                         }
                         return possibleFilePath.front() == '/'
                                 && possibleFilePath.at(1).isLetterOrNumber();
diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
index 8be15c7327d..ed74dac0d9d 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
@@ -310,9 +310,10 @@ void ClangdFollowSymbol::VirtualFunctionAssistProcessor::resetData(bool resetFol
     if (!m_followSymbol)
         return;
     m_followSymbol->d->virtualFuncAssistProcessor = nullptr;
-    if (resetFollowSymbolData)
-        m_followSymbol->emitDone();
+    ClangdFollowSymbol * const followSymbol = m_followSymbol;
     m_followSymbol = nullptr;
+    if (resetFollowSymbolData)
+        followSymbol->emitDone();
 }
 
 IAssistProposal *ClangdFollowSymbol::VirtualFunctionAssistProcessor::createProposal(bool final)
@@ -463,7 +464,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult(
     //         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.
+    //         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);
@@ -491,6 +492,9 @@ 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);
diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index 6903491fb0c..605ed2801c0 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -316,8 +316,10 @@ int forceIndentWithExtraText(QByteArray &buffer,
     // A comment at the end of the line appears to prevent clang-format from removing line breaks.
     if (dummyText == "/*//*/" || dummyText.isEmpty()) {
         if (block.previous().isValid()) {
-            const int prevEndOffset = Utils::Text::utf8NthLineOffset(block.document(), buffer,
-                    block.blockNumber()) + block.previous().text().length();
+            const int prevEndOffset = Utils::Text::utf8NthLineOffset(block.document(),
+                                                                     buffer,
+                                                                     block.blockNumber())
+                                      + block.previous().text().toUtf8().length();
             buffer.insert(prevEndOffset, " //");
             extraLength += 3;
         }
diff --git a/src/plugins/clangformat/tests/clangformat-test.cpp b/src/plugins/clangformat/tests/clangformat-test.cpp
index 80d2cc4da90..a4a85cf9065 100644
--- a/src/plugins/clangformat/tests/clangformat-test.cpp
+++ b/src/plugins/clangformat/tests/clangformat-test.cpp
@@ -730,4 +730,20 @@ void ClangFormatTest::testIndentCommentOnNewLine()
              }));
 }
 
+void ClangFormatTest::testUtf8SymbolLine()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    cout << \"ä\" << endl;",
+                 "    return 0;",
+                 "}"});
+    m_indenter->indent(*m_cursor, QChar::Null, TextEditor::TabSettings());
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    cout << \"ä\" << endl;",
+                                   "    return 0;",
+                                   "}"}));
+}
+
 } // namespace ClangFormat::Internal
diff --git a/src/plugins/clangformat/tests/clangformat-test.h b/src/plugins/clangformat/tests/clangformat-test.h
index 494ebc85daf..d1dba9a13f2 100644
--- a/src/plugins/clangformat/tests/clangformat-test.h
+++ b/src/plugins/clangformat/tests/clangformat-test.h
@@ -91,6 +91,7 @@ private slots:
     void testIndentInitializeVector();
     void testIndentFunctionArgumentOnNewLine();
     void testIndentCommentOnNewLine();
+    void testUtf8SymbolLine();
 
 private:
     void insertLines(const std::vector<QString> &lines);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index be64e7d6656..ace64582f22 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -228,6 +228,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
     stagingDir.setSettingsKey(STAGING_DIR_KEY);
     stagingDir.setLabelText(Tr::tr("Staging directory:"));
     stagingDir.setDefaultValue(initialStagingDir(kit()));
+    stagingDir.setExpectedKind(PathChooser::Kind::Directory);
 
     Kit *kit = buildConfiguration()->kit();
     if (CMakeBuildConfiguration::isIos(kit)) {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 6f7461799bd..4c93e3150d9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -26,6 +26,7 @@
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cppprojectupdater.h>
 
+#include <projectexplorer/buildmanager.h>
 #include <projectexplorer/extracompiler.h>
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
@@ -1299,7 +1300,8 @@ void CMakeBuildSystem::wireUpConnections()
     });
 
     connect(project(), &Project::projectFileIsDirty, this, [this] {
-        if (buildConfiguration()->isActive() && !isParsing()) {
+        const bool isBuilding = BuildManager::isBuilding(project());
+        if (buildConfiguration()->isActive() && !isParsing() && !isBuilding) {
             if (settings().autorunCMake()) {
                 qCDebug(cmakeBuildSystemLog) << "Requesting parse due to dirty project file";
                 reparse(CMakeBuildSystem::REPARSE_FORCE_CMAKE_RUN);
diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
index 6dc754d2bed..2f7313c4a45 100644
--- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
@@ -314,7 +314,9 @@ static void updateCMakeConfigurationWithLocalData(CMakeConfig &cmakeCache,
         return var == "CMAKE_PREFIX_PATH" || var == "CMAKE_MODULE_PATH";
     };
 
-    const FilePath projectDir = ProjectTree::currentBuildSystem()->projectDirectory();
+    const FilePath projectDir = ProjectTree::currentBuildSystem()
+                                    ? ProjectTree::currentBuildSystem()->projectDirectory()
+                                    : currentDir;
     auto updateDirVariables = [currentDir, projectDir, cmakeCache](QByteArray &value) {
         value.replace("${CMAKE_CURRENT_SOURCE_DIR}", currentDir.path().toUtf8());
         value.replace("${CMAKE_CURRENT_LIST_DIR}", currentDir.path().toUtf8());
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.cpp b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
index de4633ea617..11e2dc721df 100644
--- a/src/plugins/cmakeprojectmanager/cmakeparser.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
@@ -202,22 +202,25 @@ void CMakeParser::flush()
     if (m_lastTask.isNull())
         return;
 
-    if (m_lastTask.summary.isEmpty() && !m_lastTask.details.isEmpty())
-        m_lastTask.summary = m_lastTask.details.takeFirst();
-    m_lines += m_lastTask.details.count();
+    Task t = m_lastTask;
+    m_lastTask.clear();
 
-    if (m_callStack) {
-        m_lastTask.file = m_callStack.value().last().file;
-        m_lastTask.line = m_callStack.value().last().line;
+    if (t.summary.isEmpty() && !t.details.isEmpty())
+        t.summary = t.details.takeFirst();
+    m_lines += t.details.count();
+
+    if (m_callStack.has_value() && !m_callStack.value().isEmpty()) {
+        t.file = m_callStack.value().last().file;
+        t.line = m_callStack.value().last().line;
 
         LinkSpecs specs;
-        m_lastTask.details << QString();
-        m_lastTask.details << Tr::tr("Call stack:");
+        t.details << QString();
+        t.details << Tr::tr("Call stack:");
         m_lines += 2;
 
         m_callStack->push_front(m_errorOrWarningLine);
 
-        int offset = m_lastTask.details.join('\n').size();
+        int offset = t.details.join('\n').size();
         Utils::reverseForeach(m_callStack.value(), [&](const auto &line) {
             const QString fileAndLine = QString("%1:%2").arg(line.file.path()).arg(line.line);
             const QString completeLine = QString("  %1%2").arg(fileAndLine).arg(line.function);
@@ -228,16 +231,14 @@ void CMakeParser::flush()
                                   int(fileAndLine.length()),
                                   createLinkTarget(line.file, line.line, -1)});
 
-            m_lastTask.details << completeLine;
+            t.details << completeLine;
             offset += completeLine.length() - 2;
             ++m_lines;
         });
 
-        setDetailsFormat(m_lastTask, specs);
+        setDetailsFormat(t, specs);
     }
 
-    Task t = m_lastTask;
-    m_lastTask.clear();
     scheduleTask(t, m_lines, 1);
     m_lines = 0;
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 1dfc03af62f..9720c134608 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -171,7 +171,7 @@ CMakeManager::CMakeManager()
     mdebugger->addAction(command, Constants::CMAKE_DEBUGGING_GROUP);
     connect(m_cmakeDebuggerAction, &QAction::triggered, this, [] {
         ProjectExplorerPlugin::runStartupProject(ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE,
-                                                 false);
+                                                 true);
     });
 
     connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged, this, [this] {
diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index 4d2a0dc5f3e..34f12da7448 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -121,6 +121,10 @@ public:
         m_tooltip += "<br>" + Tr::tr("Detection source: \"%1\"").arg(m_detectionSource);
 
         m_versionDisplay = cmake.versionDisplay();
+
+        // Make sure to always have the right version in the name for Qt SDK CMake installations
+        if (m_name.startsWith("CMake") && m_name.endsWith("(Qt)"))
+            m_name = QString("CMake %1 (Qt)").arg(m_versionDisplay);
     }
 
     CMakeToolTreeItem() = default;
diff --git a/src/plugins/compilerexplorer/api/compile.cpp b/src/plugins/compilerexplorer/api/compile.cpp
index 8a159dcf369..1c73c496471 100644
--- a/src/plugins/compilerexplorer/api/compile.cpp
+++ b/src/plugins/compilerexplorer/api/compile.cpp
@@ -10,13 +10,9 @@ QFuture<CompileResult> compile(const Config &config, const CompileParameters &pa
 {
     const QUrl url = config.url({"api/compiler", parameters.compilerId, "compile"});
 
-    QNetworkRequest req(url);
-    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    req.setRawHeader("Accept", "application/json");
-
     return jsonRequest<CompileResult>(
         config.networkManager,
-        req,
+        url,
         [](const QJsonDocument &response) {
             CompileResult result;
 
diff --git a/src/plugins/compilerexplorer/api/compiler.cpp b/src/plugins/compilerexplorer/api/compiler.cpp
index 9bc7a57033d..55780234491 100644
--- a/src/plugins/compilerexplorer/api/compiler.cpp
+++ b/src/plugins/compilerexplorer/api/compiler.cpp
@@ -32,9 +32,6 @@ QFuture<Compilers> compilers(const Config &config,
     if (!fieldParam.isEmpty())
         url.setQuery(QUrlQuery{{"fields", fieldParam}});
 
-    QNetworkRequest req(url);
-    req.setRawHeader("Accept", "application/json");
-
     auto fromJson = [extraFields](const QJsonDocument &doc) {
         QJsonArray compilers = doc.array();
         Compilers result;
@@ -59,7 +56,7 @@ QFuture<Compilers> compilers(const Config &config,
         return result;
     };
 
-    return jsonRequest<Compilers>(config.networkManager, req, fromJson);
+    return jsonRequest<Compilers>(config.networkManager, url, fromJson);
 }
 
 } // namespace CompilerExplorer::Api
diff --git a/src/plugins/compilerexplorer/api/language.cpp b/src/plugins/compilerexplorer/api/language.cpp
index 0b95c7d2be6..aa162390b1c 100644
--- a/src/plugins/compilerexplorer/api/language.cpp
+++ b/src/plugins/compilerexplorer/api/language.cpp
@@ -13,10 +13,8 @@ QFuture<Languages> languages(const Config &config)
 {
     QUrl url = config.url({"api/languages"});
     url.setQuery(QUrlQuery{{"fields", "id,name,extensions,logoUrl"}});
-    QNetworkRequest req(url);
-    req.setRawHeader("Accept", "application/json");
 
-    return jsonRequest<Languages>(config.networkManager, req, [](const QJsonDocument &doc) {
+    return jsonRequest<Languages>(config.networkManager, url, [](const QJsonDocument &doc) {
         QJsonArray languages = doc.array();
         Languages result;
         for (const auto &language : languages) {
diff --git a/src/plugins/compilerexplorer/api/library.cpp b/src/plugins/compilerexplorer/api/library.cpp
index 8015beced73..579074811e4 100644
--- a/src/plugins/compilerexplorer/api/library.cpp
+++ b/src/plugins/compilerexplorer/api/library.cpp
@@ -17,10 +17,7 @@ QFuture<Libraries> libraries(const Config &config, const QString &languageId)
 
     const QUrl url = config.url({"api/libraries", languageId});
 
-    QNetworkRequest req(url);
-    req.setRawHeader("Accept", "application/json");
-
-    return jsonRequest<Libraries>(config.networkManager, req, [](const QJsonDocument &doc) {
+    return jsonRequest<Libraries>(config.networkManager, url, [](const QJsonDocument &doc) {
         QJsonArray libraries = doc.array();
         Libraries result;
 
diff --git a/src/plugins/compilerexplorer/api/request.h b/src/plugins/compilerexplorer/api/request.h
index dc55ab80b6e..af21b8a1140 100644
--- a/src/plugins/compilerexplorer/api/request.h
+++ b/src/plugins/compilerexplorer/api/request.h
@@ -14,6 +14,8 @@
 #include <QPromise>
 #include <QString>
 
+#include <utils/appinfo.h>
+
 static Q_LOGGING_CATEGORY(apiLog, "qtc.compilerexplorer.api", QtWarningMsg);
 
 namespace CompilerExplorer::Api {
@@ -45,11 +47,18 @@ static int debugRequestId = 0;
 template<typename Result>
 QFuture<Result> request(
     QNetworkAccessManager *networkManager,
-    const QNetworkRequest &req,
+    QNetworkRequest &req,
     std::function<void(const QByteArray &, QSharedPointer<QPromise<Result>>)> callback,
     QNetworkAccessManager::Operation op = QNetworkAccessManager::GetOperation,
-    const QByteArray &outData = {})
+    const QByteArray &payload = {})
 {
+    static const QByteArray userAgent = QString("%1/%2 (%3)")
+                                            .arg(QCoreApplication::applicationName())
+                                            .arg(QCoreApplication::applicationVersion())
+                                            .arg(Utils::appInfo().author)
+                                            .toUtf8();
+    req.setRawHeader("User-Agent", userAgent);
+
     QSharedPointer<QPromise<Result>> p(new QPromise<Result>);
     p->start();
 
@@ -58,12 +67,12 @@ QFuture<Result> request(
 
     const auto reqId = [r = debugRequestId] { return QString("[%1]").arg(r); };
 
-    if (outData.isEmpty())
+    if (payload.isEmpty())
         qCDebug(apiLog).noquote() << reqId() << "Requesting" << toString(op)
                                   << req.url().toString();
     else
         qCDebug(apiLog).noquote() << reqId() << "Requesting" << toString(op) << req.url().toString()
-                                  << "with payload:" << QString::fromUtf8(outData);
+                                  << "with payload:" << QString::fromUtf8(payload);
 
     QNetworkReply *reply = nullptr;
 
@@ -72,10 +81,10 @@ QFuture<Result> request(
         reply = networkManager->get(req);
         break;
     case QNetworkAccessManager::PostOperation:
-        reply = networkManager->post(req, outData);
+        reply = networkManager->post(req, payload);
         break;
     case QNetworkAccessManager::PutOperation:
-        reply = networkManager->put(req, outData);
+        reply = networkManager->put(req, payload);
         break;
     case QNetworkAccessManager::DeleteOperation:
         reply = networkManager->deleteResource(req);
@@ -115,12 +124,16 @@ QFuture<Result> request(
 
 template<typename Result>
 QFuture<Result> jsonRequest(QNetworkAccessManager *networkManager,
-                            const QNetworkRequest &req,
+                            const QUrl &url,
                             std::function<Result(QJsonDocument)> callback,
                             QNetworkAccessManager::Operation op
                             = QNetworkAccessManager::GetOperation,
-                            const QByteArray &outData = {})
+                            const QByteArray &payload = {})
 {
+    QNetworkRequest req(url);
+    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    req.setRawHeader("Accept", "application/json");
+
     return request<Result>(
         networkManager,
         req,
@@ -135,7 +148,7 @@ QFuture<Result> jsonRequest(QNetworkAccessManager *networkManager,
             promise->addResult(callback(doc));
         },
         op,
-        outData);
+        payload);
 }
 
 } // namespace CompilerExplorer::Api
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 1c04ebd2b6d..f3962d8e12b 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -52,6 +52,7 @@
 #include <utils/algorithm.h>
 #include <utils/appinfo.h>
 #include <utils/checkablemessagebox.h>
+#include <utils/dropsupport.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/fsengine/fileiconprovider.h>
@@ -1264,12 +1265,11 @@ void ICorePrivate::init()
 
     m_modeStack->statusBar()->setProperty("p_styled", true);
 
-    /*auto dropSupport = new DropSupport(this, [](QDropEvent *event, DropSupport *) {
+    auto dropSupport = new DropSupport(m_mainwindow, [](QDropEvent *event, DropSupport *) {
         return event->source() == nullptr; // only accept drops from the "outside" (e.g. file manager)
     });
-    connect(dropSupport, &DropSupport::filesDropped,
-            this, &MainWindow::openDroppedFiles);
-*/
+    connect(dropSupport, &DropSupport::filesDropped, this, &ICorePrivate::openDroppedFiles);
+
     if (HostOsInfo::isLinuxHost()) {
         m_trimTimer.setSingleShot(true);
         m_trimTimer.setInterval(60000);
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 0419ef6b035..b25150ddb71 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -625,7 +625,7 @@ void CppEditorWidget::renameUsages(const QString &replacement, QTextCursor curso
     };
     CppModelManager::followSymbol(
                 CursorInEditor{cursor, textDocument()->filePath(), this, textDocument()},
-                continuation, true, false);
+                continuation, false, false);
 }
 
 void CppEditorWidget::renameUsages(const Utils::FilePath &filePath, const QString &replacement,
@@ -1126,6 +1126,19 @@ QMenu *CppEditorWidget::createRefactorMenu(QWidget *parent) const
         case CppUseSelectionsUpdater::RunnerInfo::Invalid:
             QTC_CHECK(false && "Unexpected CppUseSelectionsUpdater runner result");
         }
+        QMetaObject::invokeMethod(menu, [menu](){
+            if (auto mainWin = ICore::mainWindow()) {
+                menu->adjustSize();
+                if (QTC_GUARD(menu->parentWidget())) {
+                    QPoint p = menu->pos();
+                    const int w = menu->width();
+                    if (p.x() + w > mainWin->screen()->geometry().width()) {
+                        p.setX(menu->parentWidget()->x() - w);
+                        menu->move(p);
+                    }
+                }
+            }
+        }, Qt::QueuedConnection);
     });
 
     return menu;
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index f562d9afece..142b2b296c9 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -590,6 +590,12 @@ void CppHighlighterTest::test_data()
         << 38 << 18 << 39 << 3 << C_STRING;
     QTest::newRow("multi-line user-defined UTF-16 string literal (suffix)")
         << 39 << 4 << 39 << 5 << C_OPERATOR;
+    QTest::newRow("multi-line raw string literal with consecutive closing parens (prefix)")
+        << 48 << 18 << 48 << 20 << C_KEYWORD;
+    QTest::newRow("multi-line raw string literal with consecutive closing parens (content)")
+        << 49 << 1 << 49 << 1 << C_STRING;
+    QTest::newRow("multi-line raw string literal with consecutive closing parens (suffix)")
+        << 49 << 2 << 49 << 3 << C_KEYWORD;
 }
 
 void CppHighlighterTest::test()
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 52f0ea89845..13fad84662f 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -1653,7 +1653,10 @@ QList<ProjectPart::ConstPtr> CppModelManager::projectPart(const FilePath &fileNa
     }
     const FilePath canonicalPath = fileName.canonicalPath();
     QWriteLocker locker(&d->m_projectLock);
-    auto it = d->m_fileToProjectParts.insert(fileName, d->m_fileToProjectParts.value(canonicalPath));
+    const auto it = d->m_fileToProjectParts.constFind(canonicalPath);
+    if (it == d->m_fileToProjectParts.constEnd())
+        return {};
+    d->m_fileToProjectParts.insert(fileName, it.value());
     return it.value();
 }
 
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index d2cf58ebfb4..b42000a0e1c 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -9115,6 +9115,23 @@ int var2;)";
 // 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
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 7c460a0ad73..37a56363401 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -9438,6 +9438,7 @@ private:
                     changeSet.remove(block.position() + firstColumn, block.position() + endColumn);
                 };
                 const int contentIndex = indexOfActualContent();
+                int removed = 0;
                 if (contentIndex == -1) {
                     if (blockIsRemovable) {
                         removeBlock();
@@ -9455,6 +9456,7 @@ private:
                 } else {
                     changeSet.remove(block.position() + firstColumn,
                                      block.position() + firstColumn + contentIndex);
+                    removed = contentIndex;
                 }
 
                 if (block == firstBlock) {
@@ -9464,7 +9466,7 @@ private:
                     // 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() + 1, ' '))) {
+                    if (blockText.startsWith(QString(newCommentStart.size() + removed + 1, ' '))) {
                         changeSet.replace(block.position(),
                                           block.position() + newCommentStart.length(),
                                           newCommentStart);
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp
index f4bcc471ad8..bf6faa7733b 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -191,6 +191,7 @@ 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)
@@ -207,6 +208,7 @@ int CppRefactoringFile::endOf(unsigned index) const
 
 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();
diff --git a/src/plugins/cppeditor/cppselectionchanger.cpp b/src/plugins/cppeditor/cppselectionchanger.cpp
index 7b9f6767451..3d31893311b 100644
--- a/src/plugins/cppeditor/cppselectionchanger.cpp
+++ b/src/plugins/cppeditor/cppselectionchanger.cpp
@@ -546,7 +546,7 @@ void CppSelectionChanger::fineTuneASTNodePositions(ASTNodePositions &positions)
 
             // Start position will be the end position minus the size of the actual contents of the
             // literal.
-            int newPosStart = newPosEnd - firstToken.string->size();
+            int newPosStart = newPosEnd - QString::fromUtf8(firstToken.string->chars()).size();
 
             // Skip raw literal parentheses.
             if (isRawLiteral)
diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp
index 543f046237d..06bf220382a 100644
--- a/src/plugins/cppeditor/cpptoolsreuse.cpp
+++ b/src/plugins/cppeditor/cpptoolsreuse.cpp
@@ -79,12 +79,12 @@ static int skipChars(QTextCursor *tc,
     return count;
 }
 
-static int skipCharsForward(QTextCursor *tc, std::function<bool(const QChar &)> skip)
+static int skipCharsForward(QTextCursor *tc, const std::function<bool(const QChar &)> &skip)
 {
     return skipChars(tc, QTextCursor::NextCharacter, 0, skip);
 }
 
-static int skipCharsBackward(QTextCursor *tc, std::function<bool(const QChar &)> skip)
+static int skipCharsBackward(QTextCursor *tc, const std::function<bool(const QChar &)> &skip)
 {
     return skipChars(tc, QTextCursor::PreviousCharacter, -1, skip);
 }
diff --git a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
index d1ec061aa29..a9102ce4578 100644
--- a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
+++ b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
@@ -44,3 +44,6 @@ static void parenTest()
         /* comment */ \
     } while (false);
 }
+
+const char* s7 = R"(
+))";
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index bb90a260cc9..6b74567e359 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1243,13 +1243,15 @@ void DebuggerPluginPrivate::createDapDebuggerPerspective(QWidget *globalLogWindo
     {
         QString name;
         char const *runMode;
+        bool forceSkipDeploy = false;
     };
 
     const QList<DapPerspective> perspectiveList = {
-        DapPerspective{Tr::tr("CMake Preset"), ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE},
+        DapPerspective{Tr::tr("CMake Preset"),
+                       ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE,
+                       /*forceSkipDeploy=*/true},
         DapPerspective{Tr::tr("GDB Preset"), ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE},
-        DapPerspective{Tr::tr("Python Preset"),
-                       ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE},
+        DapPerspective{Tr::tr("Python Preset"), ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE},
     };
 
     for (const DapPerspective &dp : perspectiveList)
@@ -1257,10 +1259,11 @@ void DebuggerPluginPrivate::createDapDebuggerPerspective(QWidget *globalLogWindo
 
     connect(&m_startDapAction, &QAction::triggered, this, [perspectiveList] {
         QComboBox *combo = qobject_cast<QComboBox *>(EngineManager::dapEngineChooser());
-        if (perspectiveList.size() > combo->currentIndex())
-            ProjectExplorerPlugin::runStartupProject(perspectiveList.at(combo->currentIndex())
-                                                         .runMode,
-                                                     false);
+        if (perspectiveList.size() > combo->currentIndex()) {
+            const DapPerspective dapPerspective = perspectiveList.at(combo->currentIndex());
+            ProjectExplorerPlugin::runStartupProject(dapPerspective.runMode,
+                                                     dapPerspective.forceSkipDeploy);
+        }
     });
 
     auto breakpointManagerView = createBreakpointManagerView("DAPDebugger.BreakWindow");
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index a12c8cec40d..5bdfb8c60a7 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -915,8 +915,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
             if (!interpreter.isEmpty() && mainScript.endsWith(".py")) {
                 m_runParameters.mainScript = mainScript;
                 m_runParameters.interpreter = interpreter;
-                if (auto args = runControl->aspect<ArgumentsAspect>())
-                    m_runParameters.inferior.command.addArgs(args->arguments, CommandLine::Raw);
                 if (runControl->runMode() == ProjectExplorer::Constants::DEBUG_RUN_MODE)
                     m_engine = createPdbEngine();
             }
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 12da7a86fc4..f3afd26b43d 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -266,7 +266,13 @@ void LldbEngine::handleLldbStarted()
     cmd2.arg("startmode", rp.startMode);
     cmd2.arg("nativemixed", isNativeMixedActive());
     cmd2.arg("workingdirectory", rp.inferior.workingDirectory.path());
-    cmd2.arg("environment", rp.inferior.environment.toStringList());
+    QStringList environment = rp.inferior.environment.toStringList();
+    // Prevent lldb from automatically setting OS_ACTIVITY_DT_MODE to mirror
+    // NSLog to stderr, as that will also mirror os_log, which we pick up in
+    // AppleUnifiedLogger::preventsStderrLogging(), and end up disabling Qt's
+    // default stderr logger. We prefer Qt's own stderr logging if we can.
+    environment << "IDE_DISABLED_OS_ACTIVITY_DT_MODE=1";
+    cmd2.arg("environment", environment);
     cmd2.arg("processargs", toHex(ProcessArgs::splitArgs(rp.inferior.command.arguments(),
                                                          HostOsInfo::hostOs()).join(QChar(0))));
     cmd2.arg("platform", rp.platform);
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 9c7c9bcac35..b58a1f4ba34 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -114,6 +114,13 @@ void PdbEngine::setupEngine()
 
     CommandLine cmd{m_interpreter, {bridge, scriptFile.path()}};
     cmd.addArg(runParameters().inferior.workingDirectory.path());
+    cmd.addArg("--");
+    QStringList arguments = runParameters().inferior.command.splitArguments();
+    if (!arguments.isEmpty() && arguments.constFirst() == "-u")
+        arguments.removeFirst(); // unbuffered added by run config
+    if (!arguments.isEmpty())
+        arguments.removeFirst(); // file added by run config
+    cmd.addArgs(arguments);
     showMessage("STARTING " + cmd.toUserOutput());
     m_proc.setEnvironment(runParameters().debugger.environment);
     m_proc.setCommand(cmd);
diff --git a/src/plugins/designer/formeditor.cpp b/src/plugins/designer/formeditor.cpp
index 776e74f0f90..bb786a4276d 100644
--- a/src/plugins/designer/formeditor.cpp
+++ b/src/plugins/designer/formeditor.cpp
@@ -32,14 +32,15 @@
 #include <utils/stringutils.h>
 #include <utils/theme/theme.h>
 
-#include <QDesignerFormEditorPluginInterface>
-#include <QDesignerFormEditorInterface>
-#include <QDesignerComponents>
-#include <QDesignerFormWindowManagerInterface>
-#include <QDesignerWidgetBoxInterface>
 #include <abstractobjectinspector.h>
-#include <QDesignerPropertyEditorInterface>
 #include <QDesignerActionEditorInterface>
+#include <QDesignerComponents>
+#include <QDesignerFormEditorInterface>
+#include <QDesignerFormEditorPluginInterface>
+#include <QDesignerFormWindowManagerInterface>
+#include <QDesignerFormWindowToolInterface>
+#include <QDesignerPropertyEditorInterface>
+#include <QDesignerWidgetBoxInterface>
 
 #include <QAction>
 #include <QActionGroup>
@@ -128,6 +129,13 @@ public:
     }
 };
 
+class ToolData
+{
+public:
+    int index;
+    QByteArray className;
+};
+
 // FormEditorData
 
 class FormEditorData : public QObject
@@ -136,8 +144,8 @@ public:
     FormEditorData();
     ~FormEditorData();
 
-    void activateEditMode(int id);
-    void toolChanged(int);
+    void activateEditMode(const ToolData &toolData);
+    void toolChanged(QDesignerFormWindowInterface *form, int);
     void print();
     void setPreviewMenuEnabled(bool e);
     void updateShortcut(Command *command);
@@ -165,6 +173,7 @@ public:
                                   const QString &actionName,
                                   Id id,
                                   int toolNumber,
+                                  const QByteArray &toolClassName,
                                   const QString &iconName = QString(),
                                   const QString &keySequence = QString());
     Command *addToolAction(QAction *a,
@@ -531,30 +540,53 @@ void FormEditorData::setupActions()
 
     m_actionGroupEditMode = new QActionGroup(this);
     m_actionGroupEditMode->setExclusive(true);
-    QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, this,
-            [this](QAction *a) { activateEditMode(a->data().toInt()); });
+    QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, this, [this](QAction *a) {
+        activateEditMode(a->data().value<ToolData>());
+    });
 
     medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
 
     m_toolActionIds.push_back("FormEditor.WidgetEditor");
-    createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
-                         Tr::tr("Edit Widgets"), m_toolActionIds.back(),
-                         EditModeWidgetEditor, "widgettool.png", Tr::tr("F3"));
+    createEditModeAction(m_actionGroupEditMode,
+                         m_contexts,
+                         medit,
+                         Tr::tr("Edit Widgets"),
+                         m_toolActionIds.back(),
+                         EditModeWidgetEditor,
+                         "qdesigner_internal::WidgetEditorTool",
+                         "widgettool.png",
+                         Tr::tr("F3"));
 
     m_toolActionIds.push_back("FormEditor.SignalsSlotsEditor");
-    createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
-                         Tr::tr("Edit Signals/Slots"), m_toolActionIds.back(),
-                         EditModeSignalsSlotEditor, "signalslottool.png", Tr::tr("F4"));
+    createEditModeAction(m_actionGroupEditMode,
+                         m_contexts,
+                         medit,
+                         Tr::tr("Edit Signals/Slots"),
+                         m_toolActionIds.back(),
+                         EditModeSignalsSlotEditor,
+                         "qdesigner_internal::SignalSlotEditorTool",
+                         "signalslottool.png",
+                         Tr::tr("F4"));
 
     m_toolActionIds.push_back("FormEditor.BuddyEditor");
-    createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
-                         Tr::tr("Edit Buddies"), m_toolActionIds.back(),
-                         EditModeBuddyEditor, "buddytool.png");
+    createEditModeAction(m_actionGroupEditMode,
+                         m_contexts,
+                         medit,
+                         Tr::tr("Edit Buddies"),
+                         m_toolActionIds.back(),
+                         EditModeBuddyEditor,
+                         "qdesigner_internal::BuddyEditorTool",
+                         "buddytool.png");
 
     m_toolActionIds.push_back("FormEditor.TabOrderEditor");
-    createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
-                         Tr::tr("Edit Tab Order"),  m_toolActionIds.back(),
-                         EditModeTabOrderEditor, "tabordertool.png");
+    createEditModeAction(m_actionGroupEditMode,
+                         m_contexts,
+                         medit,
+                         Tr::tr("Edit Tab Order"),
+                         m_toolActionIds.back(),
+                         EditModeTabOrderEditor,
+                         "qdesigner_internal::TabOrderEditorTool",
+                         "tabordertool.png");
 
     //tool actions
     m_toolActionIds.push_back("FormEditor.LayoutHorizontally");
@@ -724,13 +756,14 @@ void FormEditorData::bindShortcut(Command *command, QAction *action)
 
 // Create an action to activate a designer tool
 QAction *FormEditorData::createEditModeAction(QActionGroup *ag,
-                                     const Context &context,
-                                     ActionContainer *medit,
-                                     const QString &actionName,
-                                     Id id,
-                                     int toolNumber,
-                                     const QString &iconName,
-                                     const QString &keySequence)
+                                              const Context &context,
+                                              ActionContainer *medit,
+                                              const QString &actionName,
+                                              Id id,
+                                              int toolNumber,
+                                              const QByteArray &toolClassName,
+                                              const QString &iconName,
+                                              const QString &keySequence)
 {
     auto rc = new QAction(actionName, ag);
     rc->setCheckable(true);
@@ -742,7 +775,7 @@ QAction *FormEditorData::createEditModeAction(QActionGroup *ag,
         command->setDefaultKeySequence(QKeySequence(keySequence));
     bindShortcut(command, rc);
     medit->addAction(command, Core::Constants::G_EDIT_OTHER);
-    rc->setData(toolNumber);
+    rc->setData(QVariant::fromValue(ToolData{toolNumber, toolClassName}));
     ag->addAction(rc);
     return rc;
 }
@@ -770,8 +803,9 @@ IEditor *FormEditorData::createEditor()
     QDesignerFormWindowInterface *form = m_fwm->createFormWindow(nullptr);
     QTC_ASSERT(form, return nullptr);
     form->setPalette(Theme::initialPalette());
-    connect(form, &QDesignerFormWindowInterface::toolChanged,
-            this, &FormEditorData::toolChanged);
+    connect(form, &QDesignerFormWindowInterface::toolChanged, this, [this, form](int index) {
+        toolChanged(form, index);
+    });
 
     auto widgetHost = new SharedTools::WidgetHost( /* parent */ nullptr, form);
     FormWindowEditor *formWindowEditor = m_xmlEditorFactory->create(form);
@@ -824,26 +858,48 @@ void FormEditorData::updateShortcut(Command *command)
         a->setShortcut(command->action()->shortcut());
 }
 
-void FormEditorData::activateEditMode(int id)
+static void setTool(QDesignerFormWindowInterface *formWindow, const ToolData &toolData)
 {
-    if (const int count = m_fwm->formWindowCount())
-        for (int i = 0; i <  count; i++)
-             m_fwm->formWindow(i)->setCurrentTool(id);
+    // check for tool action with correct object name,
+    // otherwise fall back to index
+    if (!toolData.className.isEmpty()) {
+        const int toolCount = formWindow->toolCount();
+        for (int tool = 0; tool < toolCount; ++tool) {
+            if (formWindow->tool(tool)->metaObject()->className() == toolData.className) {
+                formWindow->setCurrentTool(tool);
+                return;
+            }
+        }
+    }
+    formWindow->setCurrentTool(toolData.index);
 }
 
-void FormEditorData::toolChanged(int t)
+void FormEditorData::activateEditMode(const ToolData &toolData)
 {
-    typedef QList<QAction *> ActionList;
-    if (const QAction *currentAction = m_actionGroupEditMode->checkedAction())
-        if (currentAction->data().toInt() == t)
+    if (const int count = m_fwm->formWindowCount()) {
+        for (int i = 0; i < count; i++)
+            setTool(m_fwm->formWindow(i), toolData);
+    }
+}
+
+void FormEditorData::toolChanged(QDesignerFormWindowInterface *form, int t)
+{
+    // check for action with correct object name,
+    // otherwise fall back to index
+    QDesignerFormWindowToolInterface *tool = form->tool(t);
+    const QList<QAction *> actions = m_actionGroupEditMode->actions();
+    QAction *candidateByIndex = nullptr;
+    for (QAction *action : actions) {
+        const auto toolData = action->data().value<ToolData>();
+        if (!toolData.className.isEmpty() && toolData.className == tool->metaObject()->className()) {
+            action->setChecked(true);
             return;
-    const ActionList actions = m_actionGroupEditMode->actions();
-    const ActionList::const_iterator cend = actions.constEnd();
-    for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it)
-        if ( (*it)->data().toInt() == t) {
-            (*it)->setChecked(true);
-            break;
         }
+        if (toolData.index == t)
+            candidateByIndex = action;
+    }
+    if (candidateByIndex)
+        candidateByIndex->setChecked(true);
 }
 
 void FormEditorData::print()
@@ -933,3 +989,5 @@ void addPluginPath(const QString &pluginPath)
 
 } // namespace Internal
 } // namespace Designer
+
+Q_DECLARE_METATYPE(Designer::Internal::ToolData)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 3f8c55b18d4..639f671340b 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1577,6 +1577,7 @@ void GitPluginPrivate::instantBlame()
 
     if (line >= lines) {
         m_blameMark.reset();
+        m_lastVisitedEditorLine = -1;
         return;
     }
 
@@ -1592,10 +1593,14 @@ void GitPluginPrivate::instantBlame()
     const auto commandHandler = [this, filePath, line](const CommandResult &result) {
         if (result.result() == ProcessResult::FinishedWithError &&
                 result.cleanedStdErr().contains("no such path")) {
-            disconnect(m_blameCursorPosConn);
+            stopInstantBlame();
             return;
         }
         const QString output = result.cleanedStdOut();
+        if (output.isEmpty()) {
+            stopInstantBlame();
+            return;
+        }
         const CommitInfo info = parseBlameOutput(output.split('\n'), filePath, m_author);
         m_blameMark.reset(new BlameMark(filePath, line, info));
     };
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 2cc2311e693..fd2ce79486e 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -30,7 +30,6 @@
 
 #include <utils/algorithm.h>
 
-#include <QCoreApplication>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRegularExpression>
@@ -433,7 +432,7 @@ QList<Kit *> existingKits(const McuTarget *mcuTarget)
     using namespace Constants;
     // some models have compatible name changes that refere to the same supported board across versions.
     // name changes are tracked here to recognize the corresponding kits as upgradable.
-    static QMap<QString, QStringList> upgradable_to = {
+    static const QMap<QString, QStringList> upgradable_to = {
         {"MIMXRT1170-EVK-FREERTOS", {"MIMXRT1170-EVKB-FREERTOS"}}};
     return Utils::filtered(KitManager::kits(), [mcuTarget](Kit *kit) {
         return kit->value(KIT_MCUTARGET_KITVERSION_KEY) == KIT_VERSION
diff --git a/src/plugins/mcusupport/mcusupport.qrc b/src/plugins/mcusupport/mcusupport.qrc
index f6e5c151332..dc64ac1ca2f 100644
--- a/src/plugins/mcusupport/mcusupport.qrc
+++ b/src/plugins/mcusupport/mcusupport.qrc
@@ -13,8 +13,8 @@
         <file>wizards/qmlproject/DejaVuSansMono.ttf</file>
         <file>wizards/qmlproject/LICENSE</file>
         <file>wizards/qmlproject/translation.nb_NO.ts</file>
-        <file>wizards/qmlproject/translation.en_US.ts</file>
         <file>wizards/qmlproject/BackendObject.h</file>
+        <file>wizards/qmlproject/main_big.qml.tpl</file>
         <file>wizards/qmlproject/main.qml.tpl</file>
         <file>wizards/qmlproject/project.qmlproject.tpl</file>
         <file>wizards/qmlproject/module.qmlproject.tpl</file>
diff --git a/src/plugins/mcusupport/mcutarget.cpp b/src/plugins/mcusupport/mcutarget.cpp
index faef32b61ba..84cc80f7aa0 100644
--- a/src/plugins/mcusupport/mcutarget.cpp
+++ b/src/plugins/mcusupport/mcutarget.cpp
@@ -7,6 +7,7 @@
 #include "mcusupport_global.h"
 #include "mcusupportplugin.h"
 #include "mcusupporttr.h"
+#include "mcusupportconstants.h"
 
 #include <utils/algorithm.h>
 
@@ -115,12 +116,13 @@ void McuTarget::handlePackageProblems(MessagesList &messages) const
 
 void McuTarget::resetInvalidPathsToDefault()
 {
-
     for (McuPackagePtr package : std::as_const(m_packages)) {
         if (!package)
             continue;
         if (package->isValidStatus())
             continue;
+        if (package->settingsKey() == Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK)
+            continue;
         package->setPath(package->defaultPath());
         package->writeToSettings();
     }
diff --git a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
index ead4e315a36..ab85861a5ec 100644
--- a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
@@ -5,7 +5,6 @@ Project {
     // importPaths: [] // Alternative API to ModuleFiles for importing modules.
     // projectRootPath: "." // Optional root path relative to qmlproject file path.
     mainFile: "%{MainQmlFile}" // The application's entrypoint
-    idBasedTranslations: true // Use qsTrId() instead of qsTr()
 
     MCU.Config {
         controlsStyle: "QtQuick.Controls.StyleDefault"
diff --git a/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl b/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
index 5097435e099..44f4788740c 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
@@ -16,10 +16,9 @@ Rectangle {
 
     CustomButton {
         anchors.centerIn: parent
-        text: qsTrId("hello-world")
+        text: qsTr("Hello world!")
         onClicked: BackendObject.toggle()
     }
 
     BackendObject.onCustomPropertyChanged: Qt.uiLanguage = BackendObject.customProperty ? "en_US" : "nb_NO"
-    Component.onCompleted: Qt.uiLanguage = "en_US"
 }
diff --git a/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl b/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl
new file mode 100644
index 00000000000..60f77144499
--- /dev/null
+++ b/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+import CustomModule
+
+Rectangle {
+     // Component.onCompleted: Qt.uiLanguage = "nb_NO" // Uncomment to change the UI language //TODO: Is this the "official" method of setting ui language?
+
+    Row {
+        visible: CustomObject.customProperty
+        Image {
+            anchors.centerIn: parent
+            id: icon
+            source: "assets/icon.png"
+        }
+        Text {
+            anchors.centerIn: parent
+            font.pixelSize: 28
+            id: title
+            text: " for MCUs"
+        }
+    }
+
+    CustomComponent {
+        anchors.centerIn: parent
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: CustomObject.toggle()
+    }
+}
diff --git a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
index 113cd1f07a7..0c879ccfb0d 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
@@ -5,7 +5,6 @@ Project {
     // importPaths: ["imports/CustomModule"] // Alternative API for importing modules.
     // projectRootPath: "." // Optional root path relative to qmlproject file path.
     mainFile: "%{MainQmlFile}" // The application's entrypoint
-    idBasedTranslations: true // Use qsTrId() instead of qsTr()
 
     /* Global configuration */
     MCU.Config {
@@ -89,11 +88,8 @@ Project {
 
     /* Translations */
     TranslationFiles {
-        files: [
-            "translations/%{TsFileEn}",
-            "translations/%{TsFileNo}"
-        ]
-        MCU.omitSourceLanguage: true
+        files: ["translations/%{TsFile}"]
+        MCU.omitSourceLanguage: false
     }
 
     FontFiles {
diff --git a/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts b/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts
deleted file mode 100644
index f4f94ed311c..00000000000
--- a/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
-<context>
-    <name>%{CorrectedProjectName}</name>
-    <message id="hello-world">
-        <translation>Hello world!</translation>
-    </message>
-</context>
-</TS>
diff --git a/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts b/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
index 10bdd92d377..2cd70a44edd 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
+++ b/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
@@ -3,7 +3,9 @@
 <TS version="2.1" language="nb_NO">
 <context>
     <name>%{CorrectedProjectName}</name>
-    <message id="hello-world">
+    <message>
+        <location filename="../%{MainQmlFile}" line="37"/>
+        <source>Hello world!</source>
         <translation>Hallo verden!</translation>
     </message>
 </context>
diff --git a/src/plugins/mcusupport/wizards/qmlproject/wizard.json b/src/plugins/mcusupport/wizards/qmlproject/wizard.json
index 8375cfb212b..4a5f582d432 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/wizard.json
+++ b/src/plugins/mcusupport/wizards/qmlproject/wizard.json
@@ -21,8 +21,7 @@
         { "key": "ModuleFile", "value": "CustomModule.qmlproject"},
         { "key": "QmlComponent", "value": "CustomButton.qml"},
         { "key": "InterfaceFile", "value": "BackendObject.h"},
-        { "key": "TsFileEn", "value": "%{CorrectedProjectName}.en_US.ts"},
-        { "key": "TsFileNo", "value": "%{CorrectedProjectName}.nb_NO.ts"}
+        { "key": "TsFile", "value": "%{CorrectedProjectName}.nb_NO.ts"}
     ],
 
     "pages":
@@ -104,12 +103,7 @@
                 },
                 {
                     "source": "translation.nb_NO.ts",
-                    "target": "%{QmlProjectDirectory}/translations/%{TsFileNo}",
-                    "openInEditor": false
-                },
-                {
-                    "source": "translation.en_US.ts",
-                    "target": "%{QmlProjectDirectory}/translations/%{TsFileEn}",
+                    "target": "%{QmlProjectDirectory}/translations/%{TsFile}",
                     "openInEditor": false
                 },
                 {
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index a43ca8f3816..891d43b287a 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -149,8 +149,10 @@ Kit::Kit(const Store &data)
     Store extra = storeFromVariant(data.value(DATA_KEY));
     d->m_data.clear(); // remove default values
     const Store::ConstIterator cend = extra.constEnd();
-    for (Store::ConstIterator it = extra.constBegin(); it != cend; ++it)
-        d->m_data.insert(Id::fromString(stringFromKey(it.key())), it.value());
+    for (Store::ConstIterator it = extra.constBegin(); it != cend; ++it) {
+        d->m_data.insert(Id::fromString(stringFromKey(it.key())),
+                         mapEntryFromStoreEntry(it.value()));
+    }
 
     const QStringList mutableInfoList = data.value(MUTABLE_INFO_KEY).toStringList();
     for (const QString &mutableInfo : mutableInfoList)
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 3fa03df9583..e875d87d0f6 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -565,35 +565,34 @@ public:
         : QWidget(parent)
     {
         connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit);
+        auto layout = new QVBoxLayout;
+        layout->setContentsMargins({});
+        setLayout(layout);
     }
 
     ~KitAreaWidget() override { setKit(nullptr); }
 
     void setKit(Kit *k)
     {
-        qDeleteAll(m_labels);
-        m_labels.clear();
         qDeleteAll(m_kitAspects);
         m_kitAspects.clear();
+        delete m_gridWidget;
+        m_gridWidget = nullptr;
 
         if (!k)
             return;
 
-        delete layout();
-
         Layouting::Grid grid;
         for (KitAspectFactory *factory : KitManager::kitAspectFactories()) {
             if (k && k->isMutable(factory->id())) {
                 KitAspect *aspect = factory->createKitAspect(k);
                 m_kitAspects << aspect;
-                auto label = new QLabel(aspect->displayName());
-                m_labels << label;
-                grid.addItems({label, aspect, Layouting::br});
+                grid.addItems({aspect, Layouting::br});
             }
         }
-        grid.attachTo(this);
-        layout()->setContentsMargins(3, 3, 3, 3);
-
+        m_gridWidget = grid.emerge();
+        m_gridWidget->layout()->setContentsMargins(3, 3, 3, 3);
+        layout()->addWidget(m_gridWidget);
         m_kit = k;
 
         setHidden(m_kitAspects.isEmpty());
@@ -629,7 +628,7 @@ private:
     }
 
     Kit *m_kit = nullptr;
-    QList<QWidget *> m_labels;
+    QWidget *m_gridWidget = nullptr;
     QList<KitAspect *> m_kitAspects;
 };
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 98c8690900c..a2fbb7cb288 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2098,7 +2098,7 @@ void ProjectExplorerPlugin::extensionsInitialized()
             const QStringList rawGitSearchPaths = ICore::settings()->value("Git/Path")
                     .toString().split(':', Qt::SkipEmptyParts);
             const FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths,
-                    [](const QString &rawPath) { return FilePath::fromString(rawPath); });
+                    [](const QString &rawPath) { return FilePath::fromUserInput(rawPath); });
             const FilePath fullGitPath = Environment::systemEnvironment()
                     .searchInPath(gitBinary, gitSearchPaths);
             if (!fullGitPath.isEmpty()) {
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 4a1e03d031d..8c74b331db6 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -689,7 +689,7 @@ bool FixedRunConfigurationFactory::supportsBuildKey(Target *target, const QStrin
 {
     Q_UNUSED(target)
     Q_UNUSED(key)
-    return false;
+    return true;
 }
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 76eed5c5c2c..eac873875c6 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -1305,16 +1305,18 @@ void SimpleTargetRunnerPrivate::stop()
         m_stopRequested = true;
         q->appendMessage(Tr::tr("User requested stop. Shutting down..."), NormalMessageFormat);
         switch (m_state) {
-            case Run:
-                m_process.stop();
-                if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
-                    QTC_CHECK(false); // Shouldn't happen, just emergency handling
-                    m_process.close();
-                    forwardDone();
-                }
-                break;
-            case Inactive:
-                break;
+        case Run:
+            m_process.stop();
+            if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
+                q->appendMessage(Tr::tr("Remote process did not finish in time. "
+                                        "Connectivity lost?"), ErrorMessageFormat);
+                m_process.close();
+                m_state = Inactive;
+                forwardDone();
+            }
+            break;
+        case Inactive:
+            break;
         }
     }
 }
diff --git a/src/plugins/python/images/qtforpython_neon.png b/src/plugins/python/images/qtforpython_neon.png
new file mode 100644
index 00000000000..71a7299c391
Binary files /dev/null and b/src/plugins/python/images/qtforpython_neon.png differ
diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp
index b2483c7cac6..d6ce264ccb4 100644
--- a/src/plugins/python/pyside.cpp
+++ b/src/plugins/python/pyside.cpp
@@ -128,20 +128,40 @@ void PySideInstaller::installPyside(const FilePath &python,
     } else {
         QDialog dialog;
         dialog.setWindowTitle(Tr::tr("Select PySide Version"));
-        dialog.setLayout(new QVBoxLayout());
-        dialog.layout()->addWidget(new QLabel(Tr::tr("Select which PySide version to install:")));
+
+        // Logo for the corner in the QDialog
+        QPixmap logo(":/python/images/qtforpython_neon.png");
+        QLabel *logoLabel = new QLabel();
+        logoLabel->setPixmap(logo);
+
+        QVBoxLayout *dialogLayout = new QVBoxLayout();
+        QHBoxLayout *hlayout = new QHBoxLayout();
+        hlayout->addWidget(logoLabel);
+        hlayout->addWidget(new QLabel("<b>" + Tr::tr("Installing PySide") + "</b>"));
+        dialogLayout->addLayout(hlayout);
+
+        QLabel *installDescription = new QLabel(Tr::tr("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."));
+        installDescription->setWordWrap(true);
+        dialogLayout->addWidget(installDescription);
+
+        dialogLayout->addWidget(new QLabel(Tr::tr("Select which version to install:")));
         QComboBox *pySideSelector = new QComboBox();
-        pySideSelector->addItem(Tr::tr("Latest PySide from the Python Package Index"));
+        pySideSelector->addItem(Tr::tr("Latest PySide from the PyPI"));
         for (const Utils::FilePath &version : std::as_const(availablePySides)) {
             const FilePath dir = version.parentDir();
             const QString text
                 = Tr::tr("PySide %1 Wheel (%2)").arg(dir.fileName(), dir.toUserOutput());
             pySideSelector->addItem(text, version.toVariant());
         }
-        dialog.layout()->addWidget(pySideSelector);
+        dialogLayout->addWidget(pySideSelector);
         QDialogButtonBox box;
         box.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        dialog.layout()->addWidget(&box);
+        dialogLayout->addWidget(&box);
+
+        dialog.setLayout(dialogLayout);
         connect(&box, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
         connect(&box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
 
diff --git a/src/plugins/python/python.qrc b/src/plugins/python/python.qrc
index 1a6da2a242b..6b0fe17637a 100644
--- a/src/plugins/python/python.qrc
+++ b/src/plugins/python/python.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/python">
         <file>images/settingscategory_python.png</file>
         <file>images/settingscategory_python@2x.png</file>
+        <file>images/qtforpython_neon.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 737f7fc17e9..7072506512b 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -518,7 +518,7 @@ void QbsBuildSystem::handleQbsParsingDone(bool success)
         m_qbsUpdateFutureInterface->reportCanceled();
     }
 
-    m_qbsProjectParser->deleteLater();
+    m_qbsProjectParser->deleteLaterSafely();
     m_qbsProjectParser = nullptr;
     m_qbsUpdateFutureInterface->reportFinished();
     delete m_qbsUpdateFutureInterface;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.h b/src/plugins/qbsprojectmanager/qbsprojectparser.h
index 7b793fa5d24..454211b35f9 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.h
@@ -30,6 +30,9 @@ public:
     void cancel();
     Utils::Environment environment() const { return m_environment; }
 
+    // FIXME: Why on earth do we not own the FutureInterface?
+    void deleteLaterSafely() { m_fi = nullptr; deleteLater(); }
+
     QbsSession *session() const { return m_session; }
     QJsonObject projectData() const { return m_projectData; }
     ErrorInfo error() const { return m_error; }
diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp
index 4ae804689c2..3a425e23aae 100644
--- a/src/plugins/remotelinux/genericdeploystep.cpp
+++ b/src/plugins/remotelinux/genericdeploystep.cpp
@@ -45,6 +45,7 @@ public:
         ignoreMissingFiles.setLabelText(Tr::tr("Ignore missing files:"));
         ignoreMissingFiles.setLabelPlacement(BoolAspect::LabelPlacement::InExtraLabel);
 
+        method.setSettingsKey("RemoteLinux.RsyncDeployStep.TransferMethod");
         method.setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
         method.setDisplayName(Tr::tr("Transfer method:"));
         method.addOption(Tr::tr("Use rsync if available. Otherwise use default transfer."));
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 3f875f1ef4b..efafbaef40a 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -185,6 +185,7 @@ void SshSharedConnection::connectToHost()
     });
 
     QStringList args = QStringList{"-M", "-N", "-o", "ControlPersist=no",
+            "-o", "ServerAliveInterval=10", // TODO: Make configurable?
             "-o", "PermitLocalCommand=yes", // Enable local command
             "-o", "LocalCommand=echo"}      // Local command is executed after successfully
                                             // connecting to the server. "echo" will print "\n"
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 8254f9284bd..c2324887b66 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -87,6 +87,9 @@ void ValgrindToolRunner::stop()
 {
     m_isStopping = true;
     m_runner.stop();
+    appendMessage(Tr::tr("Process terminated."), ErrorMessageFormat);
+    m_progress.reportFinished();
+    reportStopped();
 }
 
 QStringList ValgrindToolRunner::genericToolArguments() const
diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp
index df464e33247..03b868c6cfc 100644
--- a/src/plugins/valgrind/xmlprotocol/parser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/parser.cpp
@@ -710,7 +710,7 @@ public:
                 m_errorString = data.m_internalError;
         });
         QObject::connect(m_watcher.get(), &QFutureWatcherBase::finished, q, [this] {
-            emit q->done(!m_errorString, *m_errorString);
+            emit q->done(!m_errorString, m_errorString.value_or(QString()));
             m_watcher.release()->deleteLater();
             m_thread.reset();
             m_socket.reset();
diff --git a/src/plugins/webassembly/webassemblyemsdk.cpp b/src/plugins/webassembly/webassemblyemsdk.cpp
index 4ba3563c2ec..12c4d649678 100644
--- a/src/plugins/webassembly/webassemblyemsdk.cpp
+++ b/src/plugins/webassembly/webassemblyemsdk.cpp
@@ -51,7 +51,9 @@ static QString emSdkEnvOutput(const FilePath &sdkRoot)
         emSdkEnv.setCommand(CommandLine(scriptFile));
     } else {
         // File needs to be source'd, not executed.
-        emSdkEnv.setCommand({sdkRoot.withNewPath("bash"), {"-c", ". " + scriptFile.path()}});
+        CommandLine cmd{sdkRoot.withNewPath("bash"), {"-c"}};
+        cmd.addCommandLineAsSingleArg({".", {scriptFile.path()}});
+        emSdkEnv.setCommand(cmd);
     }
     emSdkEnv.runBlocking();
     const QString result = emSdkEnv.allOutput();
diff --git a/src/shared/qbs b/src/shared/qbs
index 5ef68807776..b1d6a0518a3 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 5ef68807776960c90d0572d51af36fc536bbe30e
+Subproject commit b1d6a0518a38bf37928233d31f764132081f85ed
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
index b50ea4e932e..52d313fe4eb 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -16,7 +16,6 @@
 #include <QtQuick3D/private/qquick3dviewport_p.h>
 #include <QtQuick3D/private/qquick3ddefaultmaterial_p.h>
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
-#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrenderbuffermanager_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
 #include <QtQuick3DUtils/private/qssgbounds3_p.h>
@@ -25,6 +24,12 @@
 #include <QtQuick/qquickitem.h>
 #include <QtCore/qmath.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
+
 #ifdef QUICK3D_PARTICLES_MODULE
 #include <QtQuick3DParticles/private/qquick3dparticlemodelshape_p.h>
 #include <QtQuick3DParticles/private/qquick3dparticleemitter_p.h>
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
index 64c3c25a2ab..14efba3b9e0 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
@@ -6,7 +6,6 @@
 #include "selectionboxgeometry.h"
 
 #include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
-#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrenderbuffermanager_p.h>
 #include <QtQuick3D/private/qquick3dmodel_p.h>
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
@@ -14,6 +13,12 @@
 #include <QtQuick/qquickwindow.h>
 #include <QtCore/qvector.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
+
 #include <limits>
 
 namespace QmlDesigner {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 2f905d21cf7..4c163bf69ff 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -46,7 +46,12 @@
 #define USE_PIPELINE_CACHE 1
 
 #if defined(QUICK3D_MODULE) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 2)
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
 #include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/private/qssgrendershadercache_p.h>
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
 #define USE_SHADER_CACHE 1
 #endif
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 317067142a4..5bb724a0b1d 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -139,8 +139,13 @@ def __createProjectHandleQtQuickSelection__(minimumQtVersion):
 # param buildSystem is a string holding the build system selected for the project
 # param checks turns tests in the function on if set to True
 # param available a list holding the available targets
-def __selectQtVersionDesktop__(buildSystem, checks, available=None):
-    wanted = Targets.desktopTargetClasses()
+# param targets a list holding the wanted targets - defaults to all desktop targets if empty
+# returns checked targets
+def __selectQtVersionDesktop__(buildSystem, checks, available=None, targets=[]):
+    if len(targets):
+        wanted = targets
+    else:
+        wanted = Targets.desktopTargetClasses()
     checkedTargets = __chooseTargets__(wanted, available)
     if checks:
         for target in checkedTargets:
@@ -162,6 +167,7 @@ def __selectQtVersionDesktop__(buildSystem, checks, available=None):
                     verifyChecked(cbObject % ("Profile", objectMap.realName(detailsWidget)))
                 clickButton(detailsButton)
     clickButton(waitForObject(":Next_QPushButton"))
+    return checkedTargets
 
 def __createProjectHandleLastPage__(expectedFiles=[], addToVersionControl="<None>", addToProject=None):
     if len(expectedFiles):
@@ -205,8 +211,10 @@ def __getProjectFileName__(projectName, buildSystem):
 # param checks turns tests in the function on if set to True
 # param addToVersionControl selects the specified VCS from Creator's wizard
 # param buildSystem selects the specified build system from Creator's wizard
+# param targets specifies targets that should be checked
+# returns the checked targets
 def createProject_Qt_GUI(path, projectName, checks=True, addToVersionControl="<None>",
-                         buildSystem=None):
+                         buildSystem=None, targets=[]):
     template = "Qt Widgets Application"
     available = __createProjectOrFileSelectType__("  Application (Qt)", template)
     __createProjectSetNameAndPath__(path, projectName, checks)
@@ -229,7 +237,7 @@ def createProject_Qt_GUI(path, projectName, checks=True, addToVersionControl="<N
 
     clickButton(waitForObject(":Next_QPushButton"))
     __createProjectHandleTranslationSelection__()
-    __selectQtVersionDesktop__(buildSystem, checks, available)
+    checkedTargets = __selectQtVersionDesktop__(buildSystem, checks, available, targets)
 
     expectedFiles = []
     if checks:
@@ -243,6 +251,7 @@ def createProject_Qt_GUI(path, projectName, checks=True, addToVersionControl="<N
     waitForProjectParsing()
     if checks:
         __verifyFileCreation__(path, expectedFiles)
+    return checkedTargets
 
 # Creates a Qt Console project
 # param path specifies where to create the project
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 77b493b32a0..be1f474c6e7 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -171,11 +171,13 @@ def invokeMenuItem(menu, item, *subItems):
     numberedPrefix = "%d | "
     for subItem in subItems:
         # we might have numbered sub items (e.g. "Recent Files") - these have this special prefix
-        # but on macOS we don't add these prefixes
-        if platform.system() == 'Darwin' and subItem.startswith(numberedPrefix):
-            subItem = subItem[5:]
+        hasNumPrefix = subItem.startswith(numberedPrefix)
+        if hasNumPrefix and platform.system() == 'Darwin':
+            # on macOS we don't add these prefixes
+            subItem = subItem[len(numberedPrefix):]
+            hasNumPrefix = False
 
-        if subItem.startswith(numberedPrefix):
+        if hasNumPrefix:
             triggered = False
             for i in range(1, 10):
                 try:
diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py
index 945dc5cdf50..9ce6f00a134 100644
--- a/tests/system/shared/workarounds.py
+++ b/tests/system/shared/workarounds.py
@@ -99,8 +99,7 @@ class JIRA:
                 test.fatal("No resolution info for %s" % bug)
                 self._resolution = 'Done'
             else:
-                if isinstance(data, (bytes)):
-                    data = str(data)
+                data = stringify(data)
                 data = data.replace("\r", "").replace("\n", "")
                 resPattern = re.compile('<span\s+id="resolution-val".*?>(?P<resolution>.*?)</span>')
                 resolution = resPattern.search(data)
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
index 82a7ae6ac84..30cfdfe43b4 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
@@ -1,7 +1,8 @@
 "text"	"nestinglevel"
 "CMakeLists.txt"	"0"
 "Header Files"	"1"
-"genericdock.h"	"2"
+"gui"	"2"
+"genericdock.h"	"3"
 "Source Files"	"1"
 "core"	"2"
 "book.cpp"	"3"
@@ -58,55 +59,57 @@
 "rational.cpp"	"3"
 "units.cpp"	"3"
 "main.cpp"	"2"
-"/"	"2"
-"color-schemes"	"3"
-"Solarized Dark.json"	"4"
-"Solarized Light.json"	"4"
-"Standard.json"	"4"
-"Sublime.json"	"4"
-"Terminal.json"	"4"
-"Tomorrow Night Blue.json"	"4"
-"Tomorrow Night Bright.json"	"4"
-"Tomorrow Night Eighties.json"	"4"
-"Tomorrow Night.json"	"4"
-"Tomorrow.json"	"4"
-"locale"	"3"
-"ar.qm"	"4"
-"ca_ES.qm"	"4"
-"cs_CZ.qm"	"4"
-"da.qm"	"4"
-"de_DE.qm"	"4"
-"el.qm"	"4"
-"en_GB.qm"	"4"
-"en_US.qm"	"4"
-"es_AR.qm"	"4"
-"es_ES.qm"	"4"
-"et_EE.qm"	"4"
-"eu_ES.qm"	"4"
-"fi_FI.qm"	"4"
-"fr_FR.qm"	"4"
-"he_IL.qm"	"4"
-"hu_HU.qm"	"4"
-"id_ID.qm"	"4"
-"it_IT.qm"	"4"
-"ja_JP.qm"	"4"
-"ko_KR.qm"	"4"
-"lt.qm"	"4"
-"lv_LV.qm"	"4"
-"nb_NO.qm"	"4"
-"nl_NL.qm"	"4"
-"pl_PL.qm"	"4"
-"pt_BR.qm"	"4"
-"pt_PT.qm"	"4"
-"ro_RO.qm"	"4"
-"ru_RU.qm"	"4"
-"sk.qm"	"4"
-"sv_SE.qm"	"4"
-"tr_TR.qm"	"4"
-"uz_Latn_UZ.qm"	"4"
-"vi.qm"	"4"
-"zh_CN.qm"	"4"
-"speedcrunch.png"	"3"
+"resources"	"1"
+"speedcrunch.qrc"	"2"
+"/"	"3"
+"color-schemes"	"4"
+"Solarized Dark.json"	"5"
+"Solarized Light.json"	"5"
+"Standard.json"	"5"
+"Sublime.json"	"5"
+"Terminal.json"	"5"
+"Tomorrow Night Blue.json"	"5"
+"Tomorrow Night Bright.json"	"5"
+"Tomorrow Night Eighties.json"	"5"
+"Tomorrow Night.json"	"5"
+"Tomorrow.json"	"5"
+"locale"	"4"
+"ar.qm"	"5"
+"ca_ES.qm"	"5"
+"cs_CZ.qm"	"5"
+"da.qm"	"5"
+"de_DE.qm"	"5"
+"el.qm"	"5"
+"en_GB.qm"	"5"
+"en_US.qm"	"5"
+"es_AR.qm"	"5"
+"es_ES.qm"	"5"
+"et_EE.qm"	"5"
+"eu_ES.qm"	"5"
+"fi_FI.qm"	"5"
+"fr_FR.qm"	"5"
+"he_IL.qm"	"5"
+"hu_HU.qm"	"5"
+"id_ID.qm"	"5"
+"it_IT.qm"	"5"
+"ja_JP.qm"	"5"
+"ko_KR.qm"	"5"
+"lt.qm"	"5"
+"lv_LV.qm"	"5"
+"nb_NO.qm"	"5"
+"nl_NL.qm"	"5"
+"pl_PL.qm"	"5"
+"pt_BR.qm"	"5"
+"pt_PT.qm"	"5"
+"ro_RO.qm"	"5"
+"ru_RU.qm"	"5"
+"sk.qm"	"5"
+"sv_SE.qm"	"5"
+"tr_TR.qm"	"5"
+"uz_Latn_UZ.qm"	"5"
+"vi.qm"	"5"
+"zh_CN.qm"	"5"
+"speedcrunch.png"	"4"
 "<Other Locations>"	"1"
 "manual.qrc"	"3"
 "/manual"	"4"
diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py
index 8bdb82e4e53..c0cbc815a22 100644
--- a/tests/system/suite_general/tst_openqt_creator/test.py
+++ b/tests/system/suite_general/tst_openqt_creator/test.py
@@ -45,7 +45,7 @@ def main():
         # Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609)
         selectFromLocator("p qmljs.g", "qmljs.g")
         # Now check some basic lookups in the search box
-        selectFromLocator(": qlist::qlist", "QList::QList")
+        selectFromLocator(": qlist", "QList")
         test.compare(wordUnderCursor(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")), "QList")
 
         invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
index 662eb4fe255..1f8cfb5593d 100644
--- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
+++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
@@ -44,7 +44,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "qtcreatordata"	"2"
 "qtcreatordata.pri"	"3"
 "Sources"	"2"
@@ -82,13 +81,10 @@
 "glsl"	"3"
 "glsl_120.frag"	"4"
 "glsl_120.vert"	"4"
-"glsl_120_common.glsl"	"4"
 "glsl_330.frag"	"4"
 "glsl_330.vert"	"4"
-"glsl_330_common.glsl"	"4"
 "glsl_es_100.frag"	"4"
 "glsl_es_100.vert"	"4"
-"glsl_es_100_common.glsl"	"4"
 "indexer_preincludes"	"3"
 "QtCore"	"4"
 "qconfig.h"	"5"
@@ -97,32 +93,6 @@
 "windows.h"	"4"
 "modeleditor"	"3"
 "standard.def"	"4"
-"qml-type-descriptions"	"3"
-"builtins.qmltypes"	"4"
-"qbs-base.qmltypes"	"4"
-"qbs-bundle.json"	"4"
-"qbs.qmltypes"	"4"
-"qmlproject-bundle.json"	"4"
-"qmlproject.qmltypes"	"4"
-"qmlruntime.qmltypes"	"4"
-"qmltypes-bundle.json"	"4"
-"qt-labs-folderlistmodel.qmltypes"	"4"
-"qt-labs-gestures.qmltypes"	"4"
-"qt-labs-particles.qmltypes"	"4"
-"qt5QtQuick2-bundle.json"	"4"
-"qtmobility-connectivity.qmltypes"	"4"
-"qtmobility-contacts.qmltypes"	"4"
-"qtmobility-feedback.qmltypes"	"4"
-"qtmobility-gallery.qmltypes"	"4"
-"qtmobility-location.qmltypes"	"4"
-"qtmobility-messaging.qmltypes"	"4"
-"qtmobility-organizer.qmltypes"	"4"
-"qtmobility-publishsubscribe.qmltypes"	"4"
-"qtmobility-sensors.qmltypes"	"4"
-"qtmobility-serviceframework.qmltypes"	"4"
-"qtmobility-systeminfo.qmltypes"	"4"
-"qtmultimediakit.qmltypes"	"4"
-"qtwebkit.qmltypes"	"4"
 "commands"	"4"
 "captureddatacommand.h"	"5"
 "changeauxiliarycommand.cpp"	"5"
@@ -217,7 +187,6 @@
 "propertyvaluecontainer.h"	"5"
 "reparentcontainer.cpp"	"5"
 "reparentcontainer.h"	"5"
-"sharedmemory.h"	"5"
 "sharedmemory_qt.cpp"	"5"
 "sharedmemory_unix.cpp"	"5"
 "html"	"4"
@@ -342,7 +311,6 @@
 "qml2puppet"	"4"
 "editor3d"	"5"
 "qt5compat"	"6"
-"qquick3darealight.cpp"	"7"
 "qquick3darealight_p.h"	"7"
 "camerageometry.cpp"	"6"
 "camerageometry.h"	"6"
@@ -448,7 +416,6 @@
 "qmlprivategate.cpp"	"5"
 "qmlprivategate.h"	"5"
 "qmlprivategate.pri"	"5"
-"qmlprivategate_56.cpp"	"5"
 "types"	"4"
 "enumeration.h"	"5"
 "types.pri"	"5"
@@ -585,7 +552,6 @@
 "ToggleButton.qml"	"7"
 "ToolBarButton.qml"	"7"
 "Window.qml"	"7"
-"qmlpuppet_utilities.pri"	"4"
 "qmldesigner"	"3"
 "itemLibraryQmlSources"	"4"
 "AddImport.qml"	"5"
@@ -639,7 +605,6 @@
 "down-arrow@2x.png"	"8"
 "expression.png"	"8"
 "expression@2x.png"	"8"
-"icon-gradient-list.png"	"8"
 "icon_color_conical_gradient.png"	"8"
 "icon_color_gradient.png"	"8"
 "icon_color_none.png"	"8"
@@ -933,7 +898,6 @@
 "GridView.png"	"5"
 "Image.png"	"5"
 "InfoBanner.png"	"5"
-"item-icon16.png"	"5"
 "Item.png"	"5"
 "ListButton.png"	"5"
 "ListDelegate.png"	"5"
@@ -979,7 +943,6 @@
 "styles"	"3"
 "creator-dark.xml"	"4"
 "dark.xml"	"4"
-"default.xml"	"4"
 "default_classic.xml"	"4"
 "grayscale.xml"	"4"
 "inkpot.xml"	"4"
@@ -994,8 +957,6 @@
 "tpl_resources.qrc"	"5"
 "tpl_single.cpp"	"5"
 "tpl_single.h"	"5"
-"tpl_widget.cpp"	"5"
-"tpl_widget.h"	"5"
 "tpl_widget_include.pri"	"5"
 "tpl_widget_lib.pro"	"5"
 "wizards"	"4"
@@ -1004,12 +965,8 @@
 "catch2_tst.cpp"	"7"
 "googlecommon.js"	"7"
 "gtest_dependency.pri"	"7"
-"tst.pro"	"7"
-"tst.qbs"	"7"
-"tst.txt"	"7"
 "tst_main.cpp"	"7"
 "tst_qml.tmpl"	"7"
-"tst_src.cpp"	"7"
 "tst_src_gt.cpp"	"7"
 "autotest.png"	"6"
 "autotest@2x.png"	"6"
@@ -1121,7 +1078,6 @@
 "CMakeLists.txt"	"7"
 "lib.cpp"	"7"
 "lib.h"	"7"
-"lib_global.h"	"7"
 "meson.build"	"7"
 "project.json"	"7"
 "project.pro"	"7"
@@ -1190,7 +1146,6 @@
 "widget"	"7"
 "main.pyproject"	"8"
 "wizard.json"	"8"
-"main.pyproject"	"7"
 "main_empty.py"	"7"
 "main_mainwindow.py"	"7"
 "main_qtquick.py"	"7"
@@ -1266,7 +1221,6 @@
 "myplugin.cpp"	"6"
 "myplugin.h"	"6"
 "MyPlugin.json.in"	"6"
-"myplugin_global.h"	"6"
 "mypluginconstants.h"	"6"
 "qtcreatorplugin.png"	"6"
 "qtcreatorplugin@2x.png"	"6"
@@ -1276,11 +1230,9 @@
 "themes"	"3"
 "dark.creatortheme"	"4"
 "default.creatortheme"	"4"
-"design-light.creatortheme"	"4"
 "design.creatortheme"	"4"
 "flat-dark.creatortheme"	"4"
 "flat-light.creatortheme"	"4"
-"flat.creatortheme"	"4"
 "Other files"	"2"
 "android"	"3"
 "sdk_definitions.json"	"4"
@@ -1316,13 +1268,10 @@
 "glsl"	"3"
 "glsl_120.frag"	"4"
 "glsl_120.vert"	"4"
-"glsl_120_common.glsl"	"4"
 "glsl_330.frag"	"4"
 "glsl_330.vert"	"4"
-"glsl_330_common.glsl"	"4"
 "glsl_es_100.frag"	"4"
 "glsl_es_100.vert"	"4"
-"glsl_es_100_common.glsl"	"4"
 "indexer_preincludes"	"3"
 "QtCore"	"4"
 "qconfig.h"	"5"
@@ -1331,32 +1280,6 @@
 "windows.h"	"4"
 "modeleditor"	"3"
 "standard.def"	"4"
-"qml-type-descriptions"	"3"
-"builtins.qmltypes"	"4"
-"qbs-base.qmltypes"	"4"
-"qbs-bundle.json"	"4"
-"qbs.qmltypes"	"4"
-"qmlproject-bundle.json"	"4"
-"qmlproject.qmltypes"	"4"
-"qmlruntime.qmltypes"	"4"
-"qmltypes-bundle.json"	"4"
-"qt-labs-folderlistmodel.qmltypes"	"4"
-"qt-labs-gestures.qmltypes"	"4"
-"qt-labs-particles.qmltypes"	"4"
-"qt5QtQuick2-bundle.json"	"4"
-"qtmobility-connectivity.qmltypes"	"4"
-"qtmobility-contacts.qmltypes"	"4"
-"qtmobility-feedback.qmltypes"	"4"
-"qtmobility-gallery.qmltypes"	"4"
-"qtmobility-location.qmltypes"	"4"
-"qtmobility-messaging.qmltypes"	"4"
-"qtmobility-organizer.qmltypes"	"4"
-"qtmobility-publishsubscribe.qmltypes"	"4"
-"qtmobility-sensors.qmltypes"	"4"
-"qtmobility-serviceframework.qmltypes"	"4"
-"qtmobility-systeminfo.qmltypes"	"4"
-"qtmultimediakit.qmltypes"	"4"
-"qtwebkit.qmltypes"	"4"
 "commands"	"4"
 "captureddatacommand.h"	"5"
 "changeauxiliarycommand.cpp"	"5"
@@ -1451,7 +1374,6 @@
 "propertyvaluecontainer.h"	"5"
 "reparentcontainer.cpp"	"5"
 "reparentcontainer.h"	"5"
-"sharedmemory.h"	"5"
 "sharedmemory_qt.cpp"	"5"
 "sharedmemory_unix.cpp"	"5"
 "html"	"4"
@@ -1495,7 +1417,6 @@
 "qml2puppet"	"4"
 "editor3d"	"5"
 "qt5compat"	"6"
-"qquick3darealight.cpp"	"7"
 "qquick3darealight_p.h"	"7"
 "camerageometry.cpp"	"6"
 "camerageometry.h"	"6"
@@ -1601,7 +1522,6 @@
 "qmlprivategate.cpp"	"5"
 "qmlprivategate.h"	"5"
 "qmlprivategate.pri"	"5"
-"qmlprivategate_56.cpp"	"5"
 "types"	"4"
 "enumeration.h"	"5"
 "types.pri"	"5"
@@ -1738,7 +1658,6 @@
 "ToggleButton.qml"	"7"
 "ToolBarButton.qml"	"7"
 "Window.qml"	"7"
-"qmlpuppet_utilities.pri"	"4"
 "qmldesigner"	"3"
 "newprojectdialog"	"4"
 "image"	"5"
@@ -1780,7 +1699,6 @@
 "down-arrow@2x.png"	"8"
 "expression.png"	"8"
 "expression@2x.png"	"8"
-"icon-gradient-list.png"	"8"
 "icon_color_conical_gradient.png"	"8"
 "icon_color_gradient.png"	"8"
 "icon_color_none.png"	"8"
@@ -1835,7 +1753,6 @@
 "GridView.png"	"5"
 "Image.png"	"5"
 "InfoBanner.png"	"5"
-"item-icon16.png"	"5"
 "Item.png"	"5"
 "ListButton.png"	"5"
 "ListDelegate.png"	"5"
@@ -1881,7 +1798,6 @@
 "styles"	"3"
 "creator-dark.xml"	"4"
 "dark.xml"	"4"
-"default.xml"	"4"
 "default_classic.xml"	"4"
 "grayscale.xml"	"4"
 "inkpot.xml"	"4"
@@ -1896,8 +1812,6 @@
 "tpl_resources.qrc"	"5"
 "tpl_single.cpp"	"5"
 "tpl_single.h"	"5"
-"tpl_widget.cpp"	"5"
-"tpl_widget.h"	"5"
 "tpl_widget_include.pri"	"5"
 "tpl_widget_lib.pro"	"5"
 "wizards"	"4"
@@ -1906,12 +1820,8 @@
 "catch2_tst.cpp"	"7"
 "googlecommon.js"	"7"
 "gtest_dependency.pri"	"7"
-"tst.pro"	"7"
-"tst.qbs"	"7"
-"tst.txt"	"7"
 "tst_main.cpp"	"7"
 "tst_qml.tmpl"	"7"
-"tst_src.cpp"	"7"
 "tst_src_gt.cpp"	"7"
 "autotest.png"	"6"
 "autotest@2x.png"	"6"
@@ -2023,7 +1933,6 @@
 "CMakeLists.txt"	"7"
 "lib.cpp"	"7"
 "lib.h"	"7"
-"lib_global.h"	"7"
 "meson.build"	"7"
 "project.json"	"7"
 "project.pro"	"7"
@@ -2092,7 +2001,6 @@
 "widget"	"7"
 "main.pyproject"	"8"
 "wizard.json"	"8"
-"main.pyproject"	"7"
 "main_empty.py"	"7"
 "main_mainwindow.py"	"7"
 "main_qtquick.py"	"7"
@@ -2168,7 +2076,6 @@
 "myplugin.cpp"	"6"
 "myplugin.h"	"6"
 "MyPlugin.json.in"	"6"
-"myplugin_global.h"	"6"
 "mypluginconstants.h"	"6"
 "qtcreatorplugin.png"	"6"
 "qtcreatorplugin@2x.png"	"6"
@@ -2178,11 +2085,9 @@
 "themes"	"3"
 "dark.creatortheme"	"4"
 "default.creatortheme"	"4"
-"design-light.creatortheme"	"4"
 "design.creatortheme"	"4"
 "flat-dark.creatortheme"	"4"
 "flat-light.creatortheme"	"4"
-"flat.creatortheme"	"4"
 "translations"	"1"
 "translations.pro"	"2"
 "qtcreator"	"2"
@@ -2192,7 +2097,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "Sources"	"2"
 "qtcreator_cs.ts"	"3"
 "qtcreator_da.ts"	"3"
@@ -2235,7 +2139,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "qtsingleapplication"	"2"
 "qtsingleapplication.pri"	"3"
 "qtlockedfile"	"3"
@@ -2253,12 +2156,10 @@
 "rpath"	"2"
 "rpath.pri"	"3"
 "Headers"	"2"
-"crashhandlersetup.h"	"4"
 "Sources"	"2"
 "crashhandlersetup.cpp"	"4"
 "main.cpp"	"3"
 "Other files"	"2"
-"app.qbs"	"3"
 "app_version.h.in"	"3"
 "qtcreator.rc"	"3"
 "data"	"1"
@@ -2270,7 +2171,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "qtcreatordata"	"2"
 "qtcreatordata.pri"	"3"
 "Sources"	"2"
@@ -2278,7 +2178,6 @@
 "SourceCodePro-Bold.ttf"	"4"
 "SourceCodePro-It.ttf"	"4"
 "SourceCodePro-Regular.ttf"	"4"
-"SourceCodePro.txt"	"4"
 "package-manager"	"3"
 "auto-setup.cmake"	"4"
 "conan.cmake"	"4"
@@ -2287,7 +2186,6 @@
 "SourceCodePro-Bold.ttf"	"4"
 "SourceCodePro-It.ttf"	"4"
 "SourceCodePro-Regular.ttf"	"4"
-"SourceCodePro.txt"	"4"
 "package-manager"	"3"
 "auto-setup.cmake"	"4"
 "conan.cmake"	"4"
@@ -2300,7 +2198,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "qtcreatordata"	"2"
 "qtcreatordata.pri"	"3"
 "Sources"	"2"
@@ -2382,7 +2279,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2405,7 +2301,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2539,7 +2434,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2647,7 +2541,6 @@
 "pp-cctype.h"	"5"
 "pp-engine.h"	"5"
 "pp-scanner.h"	"5"
-"pp.h"	"5"
 "PPToken.h"	"5"
 "PreprocessorClient.h"	"5"
 "PreprocessorEnvironment.h"	"5"
@@ -2701,7 +2594,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2720,7 +2612,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "qtcreatordata"	"3"
 "qtcreatordata.pri"	"4"
 "Sources"	"3"
@@ -2728,7 +2619,6 @@
 "licenses"	"5"
 "LICENSE.GPLv2"	"6"
 "LICENSE.GPLv3"	"6"
-"LICENSE.LGPLv21"	"6"
 "LICENSE.LGPLv3"	"6"
 "alert.xml"	"5"
 "autoconf.xml"	"5"
@@ -2760,7 +2650,6 @@
 "licenses"	"5"
 "LICENSE.GPLv2"	"6"
 "LICENSE.GPLv3"	"6"
-"LICENSE.LGPLv21"	"6"
 "LICENSE.LGPLv3"	"6"
 "alert.xml"	"5"
 "autoconf.xml"	"5"
@@ -2804,7 +2693,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2813,15 +2701,12 @@
 "Headers"	"3"
 "extensionsystem_global.h"	"4"
 "invoker.h"	"4"
-"iplugin.h"	"4"
 "iplugin_p.h"	"4"
 "optionsparser.h"	"4"
 "plugindetailsview.h"	"4"
 "pluginerroroverview.h"	"4"
 "pluginerrorview.h"	"4"
-"pluginmanager.h"	"4"
 "pluginmanager_p.h"	"4"
-"pluginspec.h"	"4"
 "pluginspec_p.h"	"4"
 "pluginview.h"	"4"
 "Sources"	"3"
@@ -2912,7 +2797,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -2986,7 +2870,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -3378,7 +3261,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -3387,27 +3269,6 @@
 "qtserialization"	"3"
 "qtserialization.pri"	"4"
 "Headers"	"4"
-"impl"	"6"
-"loadingrefmap.h"	"7"
-"objectid.h"	"7"
-"savingrefmap.h"	"7"
-"access.h"	"6"
-"archivebasics.h"	"6"
-"attribute.h"	"6"
-"baseclass.h"	"6"
-"flag.h"	"6"
-"friend_access.h"	"6"
-"parameters.h"	"6"
-"qxmlinarchive.h"	"6"
-"qxmloutarchive.h"	"6"
-"reference.h"	"6"
-"serialize.h"	"6"
-"serialize_basic.h"	"6"
-"serialize_container.h"	"6"
-"serialize_enum.h"	"6"
-"serialize_pointer.h"	"6"
-"tag.h"	"6"
-"typeregistry.h"	"6"
 "Sources"	"4"
 "src"	"5"
 "flag.cpp"	"6"
@@ -3425,7 +3286,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "Sources"	"3"
 "Other files"	"3"
 "process_stub.qbs"	"4"
@@ -3472,7 +3332,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -3596,7 +3455,6 @@
 "tile-icon-hor-scale.png"	"8"
 "tile-icon-vert-crop.png"	"8"
 "tile-icon-vert-scale.png"	"8"
-"tile-icon.png"	"8"
 "tr.png"	"8"
 "tr@2x.png"	"8"
 "underline-h-icon.png"	"8"
@@ -3624,7 +3482,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -3756,7 +3613,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
@@ -3773,7 +3629,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "sqlite"	"2"
 "sqlite.pro"	"3"
 "qtcreatorlibrary"	"3"
@@ -3785,7 +3640,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "sqlite_dependencies"	"4"
@@ -3865,7 +3719,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "ssh_dependencies"	"4"
@@ -3920,7 +3773,6 @@
 "ksyntaxhighlighting_logging.h"	"6"
 "ksyntaxhighlighting_version.h"	"5"
 "Sources"	"4"
-"ksyntaxhighlighting_logging.cpp"	"6"
 "qtcreatorlibrary"	"3"
 "qtcreatorlibrary.pri"	"4"
 "qtcreator"	"4"
@@ -3930,7 +3782,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "syntax-highlighting_dependencies"	"4"
@@ -3939,50 +3790,7 @@
 "shared"	"5"
 "qtcreator_pch.h"	"6"
 "Headers"	"3"
-"abstracthighlighter.h"	"5"
-"abstracthighlighter_p.h"	"5"
-"context_p.h"	"5"
-"contextswitch_p.h"	"5"
-"definition.h"	"5"
-"definition_p.h"	"5"
-"definitiondownloader.h"	"5"
-"definitionref_p.h"	"5"
-"foldingregion.h"	"5"
-"format.h"	"5"
-"format_p.h"	"5"
-"htmlhighlighter.h"	"5"
-"keywordlist_p.h"	"5"
-"matchresult_p.h"	"5"
-"repository.h"	"5"
-"repository_p.h"	"5"
-"rule_p.h"	"5"
-"state.h"	"5"
-"state_p.h"	"5"
-"syntaxhighlighter.h"	"5"
-"textstyledata_p.h"	"5"
-"theme.h"	"5"
-"themedata_p.h"	"5"
-"wildcardmatcher_p.h"	"5"
-"worddelimiters_p.h"	"5"
-"xml_p.h"	"5"
 "Sources"	"3"
-"abstracthighlighter.cpp"	"5"
-"context.cpp"	"5"
-"contextswitch.cpp"	"5"
-"definition.cpp"	"5"
-"definitiondownloader.cpp"	"5"
-"foldingregion.cpp"	"5"
-"format.cpp"	"5"
-"htmlhighlighter.cpp"	"5"
-"keywordlist.cpp"	"5"
-"repository.cpp"	"5"
-"rule.cpp"	"5"
-"state.cpp"	"5"
-"syntaxhighlighter.cpp"	"5"
-"theme.cpp"	"5"
-"themedata.cpp"	"5"
-"wildcardmatcher.cpp"	"5"
-"worddelimiters.cpp"	"5"
 "Resources"	"3"
 "/org.kde.syntax-highlighting/themes"	"5"
 "atom-one-dark.theme"	"6"
@@ -4008,8 +3816,6 @@
 "vim-dark.theme"	"6"
 "Other files"	"3"
 "syntax-highlighting.qbs"	"4"
-"syntax_shared"	"2"
-"syntax_shared.pri"	"3"
 "tracing"	"2"
 "tracing.pro"	"3"
 "qtcreatorlibrary"	"3"
@@ -4023,7 +3829,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "tracing_dependencies"	"4"
@@ -4036,22 +3841,16 @@
 "flamegraphattached.h"	"4"
 "runscenegraphtest.h"	"4"
 "safecastable.h"	"4"
-"timelineabstractrenderer.h"	"4"
 "timelineabstractrenderer_p.h"	"4"
 "timelineformattime.h"	"4"
 "timelineitemsrenderpass.h"	"4"
-"timelinemodel.h"	"4"
 "timelinemodel_p.h"	"4"
 "timelinemodelaggregator.h"	"4"
-"timelinenotesmodel.h"	"4"
 "timelinenotesmodel_p.h"	"4"
 "timelinenotesrenderpass.h"	"4"
-"timelineoverviewrenderer.h"	"4"
 "timelineoverviewrenderer_p.h"	"4"
-"timelinerenderer.h"	"4"
 "timelinerenderer_p.h"	"4"
 "timelinerenderpass.h"	"4"
-"timelinerenderstate.h"	"4"
 "timelinerenderstate_p.h"	"4"
 "timelineselectionrenderpass.h"	"4"
 "timelinetheme.h"	"4"
@@ -4131,7 +3930,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "utils_dependencies"	"4"
@@ -4144,13 +3942,11 @@
 "mimetypes"	"4"
 "mimetypes.pri"	"5"
 "Headers"	"5"
-"mimedatabase.h"	"6"
 "mimedatabase_p.h"	"6"
 "mimeglobpattern_p.h"	"6"
 "mimemagicrule_p.h"	"6"
 "mimemagicrulematcher_p.h"	"6"
 "mimeprovider_p.h"	"6"
-"mimetype.h"	"6"
 "mimetype_p.h"	"6"
 "mimetypeparser_p.h"	"6"
 "Sources"	"5"
@@ -4174,7 +3970,6 @@
 "variant"	"6"
 "variant.hpp"	"7"
 "theme"	"5"
-"theme.h"	"6"
 "theme_p.h"	"6"
 "tooltip"	"5"
 "effects.h"	"6"
@@ -4547,20 +4342,12 @@
 "collapse@2x.png"	"8"
 "compile_error_taskbar.png"	"8"
 "compile_error_taskbar@2x.png"	"8"
-"crumblepath-segment-first-hover.png"	"8"
-"crumblepath-segment-first-hover@2x.png"	"8"
 "crumblepath-segment-first.png"	"8"
 "crumblepath-segment-first@2x.png"	"8"
-"crumblepath-segment-last-hover.png"	"8"
-"crumblepath-segment-last-hover@2x.png"	"8"
 "crumblepath-segment-last.png"	"8"
 "crumblepath-segment-last@2x.png"	"8"
-"crumblepath-segment-middle-hover.png"	"8"
-"crumblepath-segment-middle-hover@2x.png"	"8"
 "crumblepath-segment-middle.png"	"8"
 "crumblepath-segment-middle@2x.png"	"8"
-"crumblepath-segment-single-hover.png"	"8"
-"crumblepath-segment-single-hover@2x.png"	"8"
 "crumblepath-segment-single.png"	"8"
 "crumblepath-segment-single@2x.png"	"8"
 "dark_fileicon.png"	"8"
@@ -4609,26 +4396,18 @@
 "fittoview@2x.png"	"8"
 "home.png"	"8"
 "home@2x.png"	"8"
-"iconoverlay_add.png"	"8"
-"iconoverlay_add@2x.png"	"8"
 "iconoverlay_add_background.png"	"8"
 "iconoverlay_add_background@2x.png"	"8"
 "iconoverlay_add_small.png"	"8"
 "iconoverlay_add_small@2x.png"	"8"
-"iconoverlay_error.png"	"8"
-"iconoverlay_error@2x.png"	"8"
 "iconoverlay_error_background.png"	"8"
 "iconoverlay_error_background@2x.png"	"8"
 "iconoverlay_reset.png"	"8"
 "iconoverlay_reset@2x.png"	"8"
-"iconoverlay_warning.png"	"8"
-"iconoverlay_warning@2x.png"	"8"
 "iconoverlay_warning_background.png"	"8"
 "iconoverlay_warning_background@2x.png"	"8"
 "info.png"	"8"
 "info@2x.png"	"8"
-"inputfield.png"	"8"
-"inputfield@2x.png"	"8"
 "inputfield_disabled.png"	"8"
 "inputfield_disabled@2x.png"	"8"
 "interrupt_small.png"	"8"
@@ -4663,10 +4442,6 @@
 "online@2x.png"	"8"
 "pan.png"	"8"
 "pan@2x.png"	"8"
-"panel_button.png"	"8"
-"panel_button@2x.png"	"8"
-"panel_button_checked.png"	"8"
-"panel_button_checked@2x.png"	"8"
 "panel_button_checked_hover.png"	"8"
 "panel_button_checked_hover@2x.png"	"8"
 "panel_button_hover.png"	"8"
@@ -4785,10 +4560,8 @@
 "detail"	"7"
 "bool_type.h"	"8"
 "impl.h"	"8"
-"iterator.h"	"8"
 "iterator_fwd.h"	"8"
 "memory.h"	"8"
-"node.h"	"8"
 "node_data.h"	"8"
 "node_iterator.h"	"8"
 "node_ref.h"	"8"
@@ -4853,7 +4626,6 @@
 "exceptions.cpp"	"6"
 "exp.cpp"	"6"
 "memory.cpp"	"6"
-"node.cpp"	"6"
 "node_data.cpp"	"6"
 "nodebuilder.cpp"	"6"
 "nodeevents.cpp"	"6"
@@ -4941,7 +4713,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -4956,7 +4727,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Android.json.in"	"6"
 "Headers"	"3"
 "android_global.h"	"4"
 "androidavdmanager.h"	"4"
@@ -4993,7 +4763,6 @@
 "androidsdkmanagerwidget.h"	"4"
 "androidsdkmodel.h"	"4"
 "androidsdkpackage.h"	"4"
-"androidservicewidget.h"	"4"
 "androidservicewidget_p.h"	"4"
 "androidsettingswidget.h"	"4"
 "androidsignaloperation.h"	"4"
@@ -5139,7 +4908,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -5154,7 +4922,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"AutoTest.json.in"	"6"
 "Headers"	"3"
 "boost"	"4"
 "boostcodeparser.h"	"5"
@@ -5508,7 +5275,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -5519,7 +5285,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"AutotoolsProjectManager.json.in"	"6"
 "Headers"	"3"
 "autogenstep.h"	"4"
 "autoreconfstep.h"	"4"
@@ -5618,7 +5383,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -5627,7 +5391,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"BareMetal.json.in"	"6"
 "uvscservers"	"3"
 "uvscservers.pri"	"4"
 "Headers"	"4"
@@ -5753,7 +5516,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -5768,7 +5530,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Bazaar.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "bazaarclient.h"	"4"
@@ -5834,7 +5595,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -5847,7 +5607,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Beautifier.json.in"	"6"
 "Headers"	"3"
 "artisticstyle"	"4"
 "artisticstyle.h"	"5"
@@ -5942,7 +5701,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -5955,7 +5713,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"BinEditor.json.in"	"6"
 "Headers"	"3"
 "bineditor_global.h"	"4"
 "bineditorconstants.h"	"4"
@@ -6006,7 +5763,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6019,7 +5775,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Bookmarks.json.in"	"6"
 "Headers"	"3"
 "bookmark.h"	"4"
 "bookmarkfilter.h"	"4"
@@ -6110,7 +5865,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -6123,7 +5877,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Boot2Qt.json.in"	"6"
 "Headers"	"3"
 "qdb_global.h"	"4"
 "qdbconstants.h"	"4"
@@ -6217,7 +5970,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6230,7 +5982,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ClangCodeModel.json.in"	"6"
 "Headers"	"3"
 "test"	"4"
 "clangautomationutils.h"	"5"
@@ -6350,7 +6101,6 @@
 "membercompletion-friend.cpp"	"7"
 "membercompletion-inside.cpp"	"7"
 "membercompletion-outside.cpp"	"7"
-"memberCompletion.cpp"	"7"
 "noDotToArrowCorrectionForFloats.cpp"	"7"
 "preprocessorKeywordsCompletion.cpp"	"7"
 "preprocessorKeywordsCompletion2.cpp"	"7"
@@ -6418,7 +6168,6 @@
 "membercompletion-friend.cpp"	"8"
 "membercompletion-inside.cpp"	"8"
 "membercompletion-outside.cpp"	"8"
-"memberCompletion.cpp"	"8"
 "noDotToArrowCorrectionForFloats.cpp"	"8"
 "preprocessorKeywordsCompletion.cpp"	"8"
 "preprocessorKeywordsCompletion2.cpp"	"8"
@@ -6521,7 +6270,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6530,7 +6278,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ClangFormat.json.in"	"6"
 "Headers"	"3"
 "clangformatconfigwidget.h"	"4"
 "clangformatfile.h"	"4"
@@ -6619,7 +6366,6 @@
 "yaml-cpp_dependencies"	"5"
 "yaml-cpp_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6628,7 +6374,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ClangTools.json.in"	"6"
 "yaml-cpp_installation"	"3"
 "yaml-cpp_installation.pri"	"4"
 "Headers"	"3"
@@ -6779,7 +6524,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6792,7 +6536,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ClassView.json.in"	"6"
 "Headers"	"3"
 "classviewconstants.h"	"4"
 "classviewmanager.h"	"4"
@@ -6861,7 +6604,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -6876,7 +6618,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ClearCase.json.in"	"6"
 "Headers"	"3"
 "activityselector.h"	"4"
 "annotationhighlighter.h"	"4"
@@ -6966,7 +6707,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -6981,7 +6721,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CMakeProjectManager.json.in"	"6"
 "Headers"	"3"
 "builddirparameters.h"	"4"
 "cmake_global.h"	"4"
@@ -7100,7 +6839,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7113,7 +6851,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CompilationDatabaseProjectManager.json.in"	"6"
 "Headers"	"3"
 "compilationdatabaseconstants.h"	"4"
 "compilationdatabaseproject.h"	"4"
@@ -7174,7 +6911,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7183,7 +6919,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Conan.json.in"	"6"
 "Headers"	"3"
 "conanconstants.h"	"4"
 "conaninstallstep.h"	"4"
@@ -7289,7 +7024,6 @@
 "filesystemfilter.cpp"	"5"
 "ilocatorfilter.cpp"	"5"
 "javascriptfilter.cpp"	"5"
-"locator.cpp"	"5"
 "locator_test.cpp"	"5"
 "locatorfiltersfilter.cpp"	"5"
 "locatorfiltertest.cpp"	"5"
@@ -7322,7 +7056,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7331,14 +7064,10 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Core.json.in"	"6"
 "Headers"	"3"
 "actionmanager"	"4"
-"actioncontainer.h"	"5"
 "actioncontainer_p.h"	"5"
-"actionmanager.h"	"5"
 "actionmanager_p.h"	"5"
-"command.h"	"5"
 "command_p.h"	"5"
 "commandbutton.h"	"5"
 "commandmappings.h"	"5"
@@ -7359,15 +7088,12 @@
 "settingsdialog.h"	"5"
 "shortcutsettings.h"	"5"
 "editormanager"	"4"
-"documentmodel.h"	"5"
 "documentmodel_p.h"	"5"
 "editorarea.h"	"5"
-"editormanager.h"	"5"
 "editormanager_p.h"	"5"
 "editorview.h"	"5"
 "editorwindow.h"	"5"
 "ieditor.h"	"5"
-"ieditorfactory.h"	"5"
 "ieditorfactory_p.h"	"5"
 "iexternaleditor.h"	"5"
 "openeditorsview.h"	"5"
@@ -7376,7 +7102,6 @@
 "progressmanager"	"4"
 "futureprogress.h"	"5"
 "progressbar.h"	"5"
-"progressmanager.h"	"5"
 "progressmanager_p.h"	"5"
 "progressview.h"	"5"
 "basefilewizard.h"	"4"
@@ -7402,7 +7127,6 @@
 "generalsettings.h"	"4"
 "generatedfile.h"	"4"
 "helpitem.h"	"4"
-"helpmanager.h"	"4"
 "helpmanager_implementation.h"	"4"
 "icontext.h"	"4"
 "icore.h"	"4"
@@ -7583,12 +7307,8 @@
 "fancyactionbar.qrc"	"4"
 "/fancyactionbar"	"5"
 "images"	"6"
-"mode_Design.png"	"7"
-"mode_Design@2x.png"	"7"
 "mode_design_mask.png"	"7"
 "mode_design_mask@2x.png"	"7"
-"mode_Edit.png"	"7"
-"mode_Edit@2x.png"	"7"
 "mode_edit_mask.png"	"7"
 "mode_edit_mask@2x.png"	"7"
 "Other files"	"3"
@@ -7632,7 +7352,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7645,7 +7364,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CodePaster.json.in"	"6"
 "Headers"	"3"
 "codepasterservice.h"	"4"
 "columnindicatortextedit.h"	"4"
@@ -7745,7 +7463,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7758,7 +7475,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Cppcheck.json.in"	"6"
 "Headers"	"3"
 "cppcheckconstants.h"	"4"
 "cppcheckdiagnostic.h"	"4"
@@ -7834,7 +7550,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -7847,7 +7562,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CppEditor.json.in"	"6"
 "Headers"	"3"
 "abstracteditorsupport.h"	"4"
 "abstractoverviewmodel.h"	"4"
@@ -7861,7 +7575,6 @@
 "clangdiagnosticconfigsmodel.h"	"4"
 "clangdiagnosticconfigsselectionwidget.h"	"4"
 "clangdiagnosticconfigswidget.h"	"4"
-"compileroptionsbuilder.h"	"4"
 "compileroptionsbuilder_test.h"	"4"
 "cppautocompleter.h"	"4"
 "cppbuiltinmodelmanagersupport.h"	"4"
@@ -7884,7 +7597,6 @@
 "cppcompletionassistprovider.h"	"4"
 "cppcurrentdocumentfilter.h"	"4"
 "cppcursorinfo.h"	"4"
-"cppdoxygen.h"	"4"
 "cppdoxygen_test.h"	"4"
 "cppeditor_global.h"	"4"
 "cppeditorconstants.h"	"4"
@@ -7900,25 +7612,20 @@
 "cppfunctiondecldeflink.h"	"4"
 "cppheadersource_test.h"	"4"
 "cpphighlighter.h"	"4"
-"cppincludehierarchy.h"	"4"
 "cppincludehierarchy_test.h"	"4"
 "cppincludesfilter.h"	"4"
 "cppindexingsupport.h"	"4"
 "cppinsertvirtualmethods.h"	"4"
 "cpplocalrenaming.h"	"4"
-"cpplocalsymbols.h"	"4"
 "cpplocalsymbols_test.h"	"4"
 "cpplocatordata.h"	"4"
-"cpplocatorfilter.h"	"4"
 "cpplocatorfilter_test.h"	"4"
 "cppminimizableinfobars.h"	"4"
-"cppmodelmanager.h"	"4"
 "cppmodelmanager_test.h"	"4"
 "cppmodelmanagersupport.h"	"4"
 "cppoutline.h"	"4"
 "cppoverviewmodel.h"	"4"
 "cppparsecontext.h"	"4"
-"cpppointerdeclarationformatter.h"	"4"
 "cpppointerdeclarationformatter_test.h"	"4"
 "cpppreprocessordialog.h"	"4"
 "cppprojectfile.h"	"4"
@@ -7928,7 +7635,6 @@
 "cppprojectupdater.h"	"4"
 "cppprojectupdaterinterface.h"	"4"
 "cppqtstyleindenter.h"	"4"
-"cppquickfix.h"	"4"
 "cppquickfix_test.h"	"4"
 "cppquickfixassistant.h"	"4"
 "cppquickfixes.h"	"4"
@@ -7943,7 +7649,6 @@
 "cppsemanticinfo.h"	"4"
 "cppsemanticinfoupdater.h"	"4"
 "cppsourceprocessertesthelper.h"	"4"
-"cppsourceprocessor.h"	"4"
 "cppsourceprocessor_test.h"	"4"
 "cpptoolsjsextension.h"	"4"
 "cpptoolsreuse.h"	"4"
@@ -7968,7 +7673,6 @@
 "indexitem.h"	"4"
 "insertionpointlocator.h"	"4"
 "modelmanagertesthelper.h"	"4"
-"projectinfo.h"	"4"
 "projectinfo_test.h"	"4"
 "projectpart.h"	"4"
 "refactoringengineinterface.h"	"4"
@@ -7980,7 +7684,6 @@
 "symbolfinder.h"	"4"
 "symbolsearcher_test.h"	"4"
 "symbolsfindfilter.h"	"4"
-"typehierarchybuilder.h"	"4"
 "typehierarchybuilder_test.h"	"4"
 "usages.h"	"4"
 "wrappablelineedit.h"	"4"
@@ -7996,7 +7699,6 @@
 "clangdiagnosticconfigsmodel.cpp"	"4"
 "clangdiagnosticconfigsselectionwidget.cpp"	"4"
 "clangdiagnosticconfigswidget.cpp"	"4"
-"compileroptionsbuilder.cpp"	"4"
 "compileroptionsbuilder_test.cpp"	"4"
 "cppautocompleter.cpp"	"4"
 "cppbuiltinmodelmanagersupport.cpp"	"4"
@@ -8017,7 +7719,6 @@
 "cppcompletionassistprocessor.cpp"	"4"
 "cppcompletionassistprovider.cpp"	"4"
 "cppcurrentdocumentfilter.cpp"	"4"
-"cppdoxygen.cpp"	"4"
 "cppdoxygen_test.cpp"	"4"
 "cppeditordocument.cpp"	"4"
 "cppeditoroutline.cpp"	"4"
@@ -8031,25 +7732,20 @@
 "cppfunctiondecldeflink.cpp"	"4"
 "cppheadersource_test.cpp"	"4"
 "cpphighlighter.cpp"	"4"
-"cppincludehierarchy.cpp"	"4"
 "cppincludehierarchy_test.cpp"	"4"
 "cppincludesfilter.cpp"	"4"
 "cppindexingsupport.cpp"	"4"
 "cppinsertvirtualmethods.cpp"	"4"
 "cpplocalrenaming.cpp"	"4"
-"cpplocalsymbols.cpp"	"4"
 "cpplocalsymbols_test.cpp"	"4"
 "cpplocatordata.cpp"	"4"
-"cpplocatorfilter.cpp"	"4"
 "cpplocatorfilter_test.cpp"	"4"
 "cppminimizableinfobars.cpp"	"4"
-"cppmodelmanager.cpp"	"4"
 "cppmodelmanager_test.cpp"	"4"
 "cppmodelmanagersupport.cpp"	"4"
 "cppoutline.cpp"	"4"
 "cppoverviewmodel.cpp"	"4"
 "cppparsecontext.cpp"	"4"
-"cpppointerdeclarationformatter.cpp"	"4"
 "cpppointerdeclarationformatter_test.cpp"	"4"
 "cpppreprocessordialog.cpp"	"4"
 "cppprojectfile.cpp"	"4"
@@ -8058,7 +7754,6 @@
 "cppprojectpartchooser.cpp"	"4"
 "cppprojectupdater.cpp"	"4"
 "cppqtstyleindenter.cpp"	"4"
-"cppquickfix.cpp"	"4"
 "cppquickfix_test.cpp"	"4"
 "cppquickfixassistant.cpp"	"4"
 "cppquickfixes.cpp"	"4"
@@ -8072,7 +7767,6 @@
 "cppselectionchanger.cpp"	"4"
 "cppsemanticinfoupdater.cpp"	"4"
 "cppsourceprocessertesthelper.cpp"	"4"
-"cppsourceprocessor.cpp"	"4"
 "cppsourceprocessor_test.cpp"	"4"
 "cpptoolsjsextension.cpp"	"4"
 "cpptoolsreuse.cpp"	"4"
@@ -8095,7 +7789,6 @@
 "indexitem.cpp"	"4"
 "insertionpointlocator.cpp"	"4"
 "modelmanagertesthelper.cpp"	"4"
-"projectinfo.cpp"	"4"
 "projectinfo_test.cpp"	"4"
 "projectpart.cpp"	"4"
 "resourcepreviewhoverhandler.cpp"	"4"
@@ -8106,7 +7799,6 @@
 "symbolfinder.cpp"	"4"
 "symbolsearcher_test.cpp"	"4"
 "symbolsfindfilter.cpp"	"4"
-"typehierarchybuilder.cpp"	"4"
 "typehierarchybuilder_test.cpp"	"4"
 "wrappablelineedit.cpp"	"4"
 "Forms"	"3"
@@ -8190,7 +7882,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -8199,7 +7890,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CtfVisualizer.json.in"	"6"
 "Headers"	"3"
 "json.hpp"	"5"
 "ctfstatisticsmodel.h"	"4"
@@ -8262,7 +7952,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -8277,7 +7966,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"CVS.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "cvseditor.h"	"4"
@@ -8440,7 +8128,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -8455,7 +8142,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Debugger.json.in"	"6"
 "shared"	"3"
 "shared.pri"	"4"
 "Headers"	"4"
@@ -8587,21 +8273,15 @@
 "breakpoint_pending_overlay.png"	"7"
 "breakpoint_pending_overlay@2x.png"	"7"
 "debugger_breakpoints.png"	"7"
-"debugger_continue.png"	"7"
-"debugger_continue@2x.png"	"7"
 "debugger_continue_1_mask.png"	"7"
 "debugger_continue_1_mask@2x.png"	"7"
 "debugger_continue_2_mask.png"	"7"
 "debugger_continue_2_mask@2x.png"	"7"
 "debugger_empty_14.png"	"7"
-"debugger_interrupt.png"	"7"
-"debugger_interrupt@2x.png"	"7"
 "debugger_interrupt_mask.png"	"7"
 "debugger_interrupt_mask@2x.png"	"7"
 "debugger_restart_small.png"	"7"
 "debugger_restart_small@2x.png"	"7"
-"debugger_reversemode.png"	"7"
-"debugger_reversemode@2x.png"	"7"
 "debugger_reversemode_background.png"	"7"
 "debugger_reversemode_background@2x.png"	"7"
 "debugger_singleinstructionmode.png"	"7"
@@ -8612,16 +8292,10 @@
 "debugger_stepout_small@2x.png"	"7"
 "debugger_stepover_small.png"	"7"
 "debugger_stepover_small@2x.png"	"7"
-"debugger_stop.png"	"7"
-"debugger_stop@2x.png"	"7"
 "debugger_stop_mask.png"	"7"
 "debugger_stop_mask@2x.png"	"7"
-"location.png"	"7"
-"location@2x.png"	"7"
 "location_background.png"	"7"
 "location_background@2x.png"	"7"
-"macos_touchbar_debug.png"	"7"
-"macos_touchbar_debug@2x.png"	"7"
 "macos_touchbar_debug_continue.png"	"7"
 "macos_touchbar_debug_continue@2x.png"	"7"
 "macos_touchbar_debug_exit.png"	"7"
@@ -8634,8 +8308,6 @@
 "macos_touchbar_debug_step_out@2x.png"	"7"
 "macos_touchbar_debug_step_over.png"	"7"
 "macos_touchbar_debug_step_over@2x.png"	"7"
-"mode_debug.png"	"7"
-"mode_debug@2x.png"	"7"
 "mode_debug_mask.png"	"7"
 "mode_debug_mask@2x.png"	"7"
 "pin.xpm"	"7"
@@ -8732,7 +8404,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -8749,7 +8420,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Designer.json.in"	"6"
 "Headers"	"3"
 "codemodelhelpers.h"	"4"
 "designer_export.h"	"4"
@@ -8822,7 +8492,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -8835,10 +8504,8 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"DiffEditor.json.in"	"6"
 "Headers"	"3"
 "descriptionwidgetwatcher.h"	"4"
-"diffeditor.h"	"4"
 "diffeditor_global.h"	"4"
 "diffeditorconstants.h"	"4"
 "diffeditorcontroller.h"	"4"
@@ -8918,7 +8585,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -8929,7 +8595,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Docker.json.in"	"6"
 "Headers"	"3"
 "docker_global.h"	"4"
 "dockerbuildstep.h"	"4"
@@ -8975,7 +8640,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -8988,7 +8652,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"EmacsKeys.json.in"	"6"
 "Headers"	"3"
 "emacskeysconstants.h"	"4"
 "emacskeysplugin.h"	"4"
@@ -9031,7 +8694,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9044,7 +8706,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"FakeVim.json.in"	"6"
 "Headers"	"3"
 "fakevimactions.h"	"4"
 "fakevimhandler.h"	"4"
@@ -9106,7 +8767,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -9121,7 +8781,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"GenericProjectManager.json.in"	"6"
 "Headers"	"3"
 "filesselectionwizardpage.h"	"4"
 "genericbuildconfiguration.h"	"4"
@@ -9212,7 +8871,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9227,7 +8885,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Git.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "branchadddialog.h"	"4"
@@ -9335,7 +8992,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9348,7 +9004,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"GLSLEditor.json.in"	"6"
 "Headers"	"3"
 "glslautocompleter.h"	"4"
 "glslcompletionassist.h"	"4"
@@ -9396,7 +9051,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9405,7 +9059,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"HelloWorld.json.in"	"6"
 "Headers"	"3"
 "helloworldplugin.h"	"4"
 "helloworldwindow.h"	"4"
@@ -9470,7 +9123,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9483,7 +9135,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Help.json.in"	"6"
 "Headers"	"3"
 "docsettingspage.h"	"4"
 "filtersettingspage.h"	"4"
@@ -9533,8 +9184,6 @@
 "images"	"6"
 "macos_touchbar_help.png"	"7"
 "macos_touchbar_help@2x.png"	"7"
-"mode_help.png"	"7"
-"mode_help@2x.png"	"7"
 "mode_help_mask.png"	"7"
 "mode_help_mask@2x.png"	"7"
 "settingscategory_help.png"	"7"
@@ -9566,7 +9215,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9575,7 +9223,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ImageViewer.json.in"	"6"
 "Headers"	"3"
 "exportdialog.h"	"4"
 "imageview.h"	"4"
@@ -9638,7 +9285,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9647,7 +9293,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"IncrediBuild.json.in"	"6"
 "Headers"	"3"
 "buildconsolebuildstep.h"	"4"
 "cmakecommandbuilder.h"	"4"
@@ -9735,7 +9380,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9744,7 +9388,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Ios.json.in"	"6"
 "Headers"	"3"
 "createsimulatordialog.h"	"4"
 "iosbuildconfiguration.h"	"4"
@@ -9839,7 +9482,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9852,7 +9494,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"LanguageClient.json.in"	"6"
 "Headers"	"3"
 "client.h"	"4"
 "diagnosticmanager.h"	"4"
@@ -9939,7 +9580,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -9952,7 +9592,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Macros.json.in"	"6"
 "Headers"	"3"
 "actionmacrohandler.h"	"4"
 "findmacrohandler.h"	"4"
@@ -10017,7 +9656,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10026,7 +9664,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Marketplace.json.in"	"6"
 "Headers"	"3"
 "marketplaceplugin.h"	"4"
 "productlistmodel.h"	"4"
@@ -10103,7 +9740,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -10114,7 +9750,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"McuSupport.json.in"	"6"
 "Headers"	"3"
 "mcusupport_global.h"	"4"
 "mcusupportcmakemapper.h"	"4"
@@ -10194,7 +9829,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10209,7 +9843,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Mercurial.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "authenticationdialog.h"	"4"
@@ -10293,7 +9926,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -10304,7 +9936,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"MesonProjectManager.json.in"	"6"
 "Headers"	"3"
 "exewrappers"	"4"
 "mesontools.h"	"5"
@@ -10474,7 +10105,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10483,7 +10113,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ModelEditor.json.in"	"6"
 "Headers"	"3"
 "actionhandler.h"	"4"
 "classviewcontroller.h"	"4"
@@ -10496,7 +10125,6 @@
 "extpropertiesmview.h"	"4"
 "jsextension.h"	"4"
 "modeldocument.h"	"4"
-"modeleditor.h"	"4"
 "modeleditor_constants.h"	"4"
 "modeleditor_global.h"	"4"
 "modeleditor_plugin.h"	"4"
@@ -10522,7 +10150,6 @@
 "extpropertiesmview.cpp"	"4"
 "jsextension.cpp"	"4"
 "modeldocument.cpp"	"4"
-"modeleditor.cpp"	"4"
 "modeleditor_plugin.cpp"	"4"
 "modeleditorfactory.cpp"	"4"
 "modelindexer.cpp"	"4"
@@ -10577,7 +10204,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10590,7 +10216,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Nim.json.in"	"6"
 "Headers"	"3"
 "editor"	"4"
 "nimcompletionassistprovider.h"	"5"
@@ -10721,7 +10346,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10736,7 +10360,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Perforce.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "changenumberdialog.h"	"4"
@@ -10822,7 +10445,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -10833,7 +10455,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"PerfProfiler.json.in"	"6"
 "perfprofilertracefile_test.h"	"5"
 "perfresourcecounter_test.h"	"5"
 "perfconfigeventsmodel.h"	"4"
@@ -10920,7 +10541,6 @@
 "jsonwizard"	"3"
 "jsonwizard.pri"	"4"
 "Headers"	"4"
-"jsonfieldpage.h"	"5"
 "jsonfieldpage_p.h"	"5"
 "jsonfilepage.h"	"5"
 "jsonkitspage.h"	"5"
@@ -10930,7 +10550,6 @@
 "jsonwizardfactory.h"	"5"
 "jsonwizardfilegenerator.h"	"5"
 "jsonwizardgeneratorfactory.h"	"5"
-"jsonwizardpagefactory.h"	"5"
 "jsonwizardpagefactory_p.h"	"5"
 "jsonwizardscannergenerator.h"	"5"
 "wizarddebug.h"	"5"
@@ -10944,7 +10563,6 @@
 "jsonwizardfactory.cpp"	"5"
 "jsonwizardfilegenerator.cpp"	"5"
 "jsonwizardgeneratorfactory.cpp"	"5"
-"jsonwizardpagefactory.cpp"	"5"
 "jsonwizardpagefactory_p.cpp"	"5"
 "jsonwizardscannergenerator.cpp"	"5"
 "qtcreatorplugin"	"3"
@@ -10978,7 +10596,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -10991,7 +10608,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ProjectExplorer.json.in"	"6"
 "Headers"	"3"
 "devicesupport"	"4"
 "desktopdevice.h"	"5"
@@ -11103,7 +10719,6 @@
 "project.h"	"4"
 "projectconfiguration.h"	"4"
 "projectconfigurationmodel.h"	"4"
-"projectexplorer.h"	"4"
 "projectexplorer_export.h"	"4"
 "projectexplorerconstants.h"	"4"
 "projectexplorericons.h"	"4"
@@ -11323,8 +10938,6 @@
 "images"	"6"
 "analyzer_overlay_small.png"	"7"
 "analyzer_overlay_small@2x.png"	"7"
-"build.png"	"7"
-"build@2x.png"	"7"
 "build_hammerhandle_mask.png"	"7"
 "build_hammerhandle_mask@2x.png"	"7"
 "build_hammerhead_mask.png"	"7"
@@ -11386,8 +10999,6 @@
 "fileoverlay_unknown@2x.png"	"7"
 "importasproject.png"	"7"
 "importasproject@2x.png"	"7"
-"mode_project.png"	"7"
-"mode_project@2x.png"	"7"
 "mode_project_mask.png"	"7"
 "mode_project_mask@2x.png"	"7"
 "ProjectDependencies.png"	"7"
@@ -11395,8 +11006,6 @@
 "rebuildhammerhandles@2x.png"	"7"
 "rebuildhammerheads.png"	"7"
 "rebuildhammerheads@2x.png"	"7"
-"run.png"	"7"
-"run@2x.png"	"7"
 "run_mask.png"	"7"
 "run_mask@2x.png"	"7"
 "RunSettings.png"	"7"
@@ -11469,7 +11078,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -11482,7 +11090,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Python.json.in"	"6"
 "Headers"	"3"
 "pythonconstants.h"	"4"
 "pythoneditor.h"	"4"
@@ -11594,7 +11201,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -11611,7 +11217,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmakeProjectManager.json.in"	"6"
 "Headers"	"3"
 "wizards"	"4"
 "qtprojectparameters.h"	"5"
@@ -11764,20 +11369,15 @@
 "componentsplugin.qrc"	"6"
 "/componentsplugin"	"7"
 "images"	"8"
-"column-layouts-icon-16px.png"	"9"
 "column-layouts-icon.png"	"9"
 "column-layouts-icon@2x.png"	"9"
-"grid-layouts-icon-16px.png"	"9"
 "grid-layouts-icon.png"	"9"
 "grid-layouts-icon@2x.png"	"9"
 "item-icon.png"	"9"
 "item-icon16.png"	"9"
-"row-layouts-icon-16px.png"	"9"
 "row-layouts-icon.png"	"9"
 "row-layouts-icon@2x.png"	"9"
-"splitview-layouts-icon-16px.png"	"9"
 "splitview-layouts-icon.png"	"9"
-"stack-layouts-icon-16px.png"	"9"
 "stack-layouts-icon.png"	"9"
 "stack-layouts-icon@2x.png"	"9"
 "components.metainfo"	"8"
@@ -11890,7 +11490,6 @@
 "formatoperation.h"	"6"
 "hdrimage.h"	"6"
 "layoutingridlayout.h"	"6"
-"modelnodecontextmenu.h"	"6"
 "modelnodecontextmenu_helper.h"	"6"
 "modelnodeoperations.h"	"6"
 "navigation2d.h"	"6"
@@ -11912,7 +11511,6 @@
 "formatoperation.cpp"	"6"
 "hdrimage.cpp"	"6"
 "layoutingridlayout.cpp"	"6"
-"modelnodecontextmenu.cpp"	"6"
 "modelnodecontextmenu_helper.cpp"	"6"
 "modelnodeoperations.cpp"	"6"
 "navigation2d.cpp"	"6"
@@ -12597,8 +12195,6 @@
 "scrubhandle-48.png"	"8"
 "scrubhandle-disabled-24.png"	"8"
 "scrubhandle-disabled-48.png"	"8"
-"snapping.png"	"8"
-"snapping@2x.png"	"8"
 "snapping_and_anchoring.png"	"8"
 "snapping_and_anchoring@2x.png"	"8"
 "instances"	"4"
@@ -12682,30 +12278,30 @@
 "itemlibrary.qrc"	"6"
 "/ItemLibrary"	"7"
 "images"	"8"
-"asset_font_128.png"	"9"
-"asset_font_192.png"	"9"
-"asset_font_256.png"	"9"
 "asset_font_32.png"	"9"
-"asset_font_384.png"	"9"
 "asset_font_48.png"	"9"
 "asset_font_64.png"	"9"
 "asset_font_96.png"	"9"
-"asset_shader_128.png"	"9"
-"asset_shader_192.png"	"9"
-"asset_shader_256.png"	"9"
+"asset_font_128.png"	"9"
+"asset_font_192.png"	"9"
+"asset_font_256.png"	"9"
+"asset_font_384.png"	"9"
 "asset_shader_32.png"	"9"
-"asset_shader_384.png"	"9"
 "asset_shader_48.png"	"9"
 "asset_shader_64.png"	"9"
 "asset_shader_96.png"	"9"
-"asset_sound_128.png"	"9"
-"asset_sound_192.png"	"9"
-"asset_sound_256.png"	"9"
+"asset_shader_128.png"	"9"
+"asset_shader_192.png"	"9"
+"asset_shader_256.png"	"9"
+"asset_shader_384.png"	"9"
 "asset_sound_32.png"	"9"
-"asset_sound_384.png"	"9"
 "asset_sound_48.png"	"9"
 "asset_sound_64.png"	"9"
 "asset_sound_96.png"	"9"
+"asset_sound_128.png"	"9"
+"asset_sound_192.png"	"9"
+"asset_sound_256.png"	"9"
+"asset_sound_384.png"	"9"
 "browse.png"	"9"
 "browse@2x.png"	"9"
 "item-3D_model-icon.png"	"9"
@@ -12944,7 +12540,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "qtsupport_dependencies"	"5"
@@ -12961,7 +12556,6 @@
 "shared"	"6"
 "qtcreator_gui_pch.h"	"7"
 "Other files"	"5"
-"QmlDesigner.json.in"	"7"
 "resources"	"4"
 "resources.pri"	"5"
 "Resources"	"5"
@@ -13115,9 +12709,6 @@
 "global_record_keyframes@2x.png"	"9"
 "is_keyframe.png"	"9"
 "is_keyframe@2x.png"	"9"
-"keyframe-16px.png"	"9"
-"keyframe.png"	"9"
-"keyframe@2x.png"	"9"
 "keyframe_autobezier_active.png"	"9"
 "keyframe_autobezier_active@2x.png"	"9"
 "keyframe_autobezier_inactive.png"	"9"
@@ -13257,76 +12848,55 @@
 "/qtquickplugin"	"7"
 "images"	"8"
 "animated-image-icon.png"	"9"
-"animated-image-icon16.png"	"9"
 "animated-image-icon@2x.png"	"9"
 "audio-output-16px.png"	"9"
 "audio-output-24px.png"	"9"
 "audio-output-24px@2x.png"	"9"
 "border-image-icon.png"	"9"
-"border-image-icon16.png"	"9"
 "border-image-icon@2x.png"	"9"
-"column-positioner-icon-16px.png"	"9"
 "column-positioner-icon.png"	"9"
 "column-positioner-icon@2x.png"	"9"
 "component-icon.png"	"9"
-"component-icon16.png"	"9"
 "component-icon@2x.png"	"9"
 "default-icon.png"	"9"
 "flickable-icon.png"	"9"
-"flickable-icon16.png"	"9"
 "flickable-icon@2x.png"	"9"
 "flipable-icon.png"	"9"
 "flipable-icon16.png"	"9"
-"flow-positioner-icon-16px.png"	"9"
 "flow-positioner-icon.png"	"9"
 "flow-positioner-icon@2x.png"	"9"
 "focusscope-icon.png"	"9"
-"focusscope-icon16.png"	"9"
 "focusscope-icon@2x.png"	"9"
-"grid-positioner-icon-16px.png"	"9"
 "grid-positioner-icon.png"	"9"
 "grid-positioner-icon@2x.png"	"9"
 "gridview-icon.png"	"9"
-"gridview-icon16.png"	"9"
 "gridview-icon@2x.png"	"9"
 "image-icon.png"	"9"
-"image-icon16.png"	"9"
 "image-icon@2x.png"	"9"
 "item-icon.png"	"9"
-"item-icon16.png"	"9"
 "item-icon@2x.png"	"9"
 "listview-icon.png"	"9"
-"listview-icon16.png"	"9"
 "listview-icon@2x.png"	"9"
 "loader-icon.png"	"9"
-"loader-icon16.png"	"9"
 "loader-icon@2x.png"	"9"
 "media-player-16px.png"	"9"
 "media-player-24px.png"	"9"
 "media-player-24px@2x.png"	"9"
 "mouse-area-icon.png"	"9"
-"mouse-area-icon16.png"	"9"
 "mouse-area-icon@2x.png"	"9"
 "pathview-icon.png"	"9"
-"pathview-icon16.png"	"9"
 "pathview-icon@2x.png"	"9"
 "rect-icon.png"	"9"
-"rect-icon16.png"	"9"
 "rect-icon@2x.png"	"9"
 "repeater-icon.png"	"9"
-"repeater-icon16.png"	"9"
 "repeater-icon@2x.png"	"9"
-"row-positioner-icon-16px.png"	"9"
 "row-positioner-icon.png"	"9"
 "row-positioner-icon@2x.png"	"9"
 "text-edit-icon.png"	"9"
-"text-edit-icon16.png"	"9"
 "text-edit-icon@2x.png"	"9"
 "text-icon.png"	"9"
-"text-icon16.png"	"9"
 "text-icon@2x.png"	"9"
 "text-input-icon.png"	"9"
-"text-input-icon16.png"	"9"
 "text-input-icon@2x.png"	"9"
 "video-16px.png"	"9"
 "video-24px.png"	"9"
@@ -13415,7 +12985,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -13428,7 +12997,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmlJSEditor.json.in"	"6"
 "Headers"	"3"
 "qmlexpressionundercursor.h"	"4"
 "qmljsautocompleter.h"	"4"
@@ -13436,10 +13004,8 @@
 "qmljscomponentfromobjectdef.h"	"4"
 "qmljscomponentnamedialog.h"	"4"
 "qmljseditingsettingspage.h"	"4"
-"qmljseditor.h"	"4"
 "qmljseditor_global.h"	"4"
 "qmljseditorconstants.h"	"4"
-"qmljseditordocument.h"	"4"
 "qmljseditordocument_p.h"	"4"
 "qmljseditorplugin.h"	"4"
 "qmljsfindreferences.h"	"4"
@@ -13543,7 +13109,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -13558,7 +13123,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmlJSTools.json.in"	"6"
 "Headers"	"3"
 "qmljsbundleprovider.h"	"4"
 "qmljscodestylepreferencesfactory.h"	"4"
@@ -13663,7 +13227,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -13676,7 +13239,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmlPreview.json.in"	"6"
 "qmlpreviewclient_test.h"	"5"
 "qmlpreviewplugin_test.h"	"5"
 "qmldebugtranslationclient.h"	"4"
@@ -13757,7 +13319,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -13772,7 +13333,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmlProfiler.json.in"	"6"
 "debugmessagesmodel_test.h"	"5"
 "fakedebugserver.h"	"5"
 "flamegraphmodel_test.h"	"5"
@@ -13934,7 +13494,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -13945,7 +13504,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QmlProjectManager.json.in"	"6"
 "Headers"	"3"
 "qmlmainfileaspect.h"	"4"
 "qmlmultilanguageaspect.h"	"4"
@@ -14031,7 +13589,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -14044,7 +13601,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Qnx.json.in"	"6"
 "Headers"	"3"
 "qnx_export.h"	"4"
 "qnxanalyzesupport.h"	"4"
@@ -14111,7 +13667,6 @@
 "qtcreator_testvars"	"3"
 "qtcreator_testvars.pri"	"4"
 "Other files"	"3"
-"CMakeLists.txt"	"5"
 "qtsupport"	"2"
 "qtsupport.pro"	"3"
 "proparser"	"3"
@@ -14122,7 +13677,6 @@
 "proitems.h"	"5"
 "prowriter.h"	"5"
 "qmake_global.h"	"5"
-"qmakeevaluator.h"	"5"
 "qmakeevaluator_p.h"	"5"
 "qmakeglobals.h"	"5"
 "qmakeparser.h"	"5"
@@ -14179,7 +13733,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -14192,7 +13745,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"QtSupport.json.in"	"6"
 "Headers"	"3"
 "baseqtversion.h"	"4"
 "codegenerator.h"	"4"
@@ -14325,7 +13877,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "remotelinux_dependencies"	"4"
@@ -14336,7 +13887,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"RemoteLinux.json.in"	"6"
 "Headers"	"3"
 "abstractpackagingstep.h"	"4"
 "abstractremotelinuxdeployservice.h"	"4"
@@ -14476,7 +14026,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "resourceeditor_dependencies"	"4"
@@ -14487,7 +14036,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ResourceEditor.json.in"	"6"
 "Headers"	"3"
 "resource_global.h"	"4"
 "resourceeditorconstants.h"	"4"
@@ -14604,9 +14152,7 @@
 "initial.png"	"8"
 "more_colors.png"	"8"
 "navigator.png"	"8"
-"parallel.png"	"8"
 "parallel_icon.png"	"8"
-"state.png"	"8"
 "state_color.png"	"8"
 "statistics.png"	"8"
 "outputpane"	"3"
@@ -14751,7 +14297,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -14768,7 +14313,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"ScxmlEditor.json.in"	"6"
 "Headers"	"3"
 "scxmleditor_global.h"	"4"
 "scxmleditorconstants.h"	"4"
@@ -14816,7 +14360,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -14831,7 +14374,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"SerialTerminal.json.in"	"6"
 "Headers"	"3"
 "consolelineedit.h"	"4"
 "serialcontrol.h"	"4"
@@ -14878,7 +14420,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -14893,7 +14434,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"SilverSearcher.json.in"	"6"
 "Headers"	"3"
 "findinfilessilversearcher.h"	"4"
 "outputparser_test.h"	"4"
@@ -14973,7 +14513,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -14986,7 +14525,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"StudioWelcome.json.in"	"6"
 "Headers"	"3"
 "createproject.h"	"4"
 "examplecheckout.h"	"4"
@@ -15024,8 +14562,6 @@
 "QML"	"3"
 "qml"	"4"
 "downloaddialog"	"5"
-"FileDownloader.qml"	"7"
-"FileExtractor.qml"	"7"
 "ArcItem.qml"	"6"
 "CircularIndicator.ui.qml"	"6"
 "CoolProgressBar.ui.qml"	"6"
@@ -15042,14 +14578,12 @@
 "Image2.qml"	"6"
 "main.qml"	"6"
 "RectangleMask.qml"	"6"
-"Sequencer.qml"	"6"
 "Sequencer_Bars.qml"	"6"
 "SlidersTogether.qml"	"6"
-"Splash_Image25d.qml"	"6"
 "Splash_Image2d_png.qml"	"6"
+"Splash_Image25d.qml"	"6"
 "Welcome_splash.qml"	"6"
 "welcomepage"	"5"
-"Constants.qml"	"7"
 "mockData"	"6"
 "projectmodel"	"7"
 "ProjectModel.qml"	"8"
@@ -15189,7 +14723,6 @@
 "vcsbase_dependencies"	"5"
 "vcsbase_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15206,7 +14739,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Subversion.json.in"	"6"
 "Headers"	"3"
 "annotationhighlighter.h"	"4"
 "subversionclient.h"	"4"
@@ -15259,7 +14791,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15270,7 +14801,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"TaskList.json.in"	"6"
 "Headers"	"3"
 "stopmonitoringhandler.h"	"4"
 "taskfile.h"	"4"
@@ -15307,7 +14837,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15320,7 +14849,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"TextEditor.json.in"	"6"
 "syntax_shared"	"3"
 "syntax_shared.pri"	"4"
 "Headers"	"3"
@@ -15410,7 +14938,6 @@
 "tabsettingswidget.h"	"4"
 "textdocument.h"	"4"
 "textdocumentlayout.h"	"4"
-"texteditor.h"	"4"
 "texteditor_global.h"	"4"
 "texteditor_p.h"	"4"
 "texteditoractionhandler.h"	"4"
@@ -15501,7 +15028,6 @@
 "tabsettingswidget.cpp"	"4"
 "textdocument.cpp"	"4"
 "textdocumentlayout.cpp"	"4"
-"texteditor.cpp"	"4"
 "texteditor_test.cpp"	"4"
 "texteditoractionhandler.cpp"	"4"
 "texteditorconstants.cpp"	"4"
@@ -15584,7 +15110,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15595,7 +15120,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Todo.json.in"	"6"
 "Headers"	"3"
 "constants.h"	"4"
 "cpptodoitemsscanner.h"	"4"
@@ -15673,7 +15197,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15684,7 +15207,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"UpdateInfo.json.in"	"6"
 "Headers"	"3"
 "settingspage.h"	"4"
 "updateinfoplugin.h"	"4"
@@ -15708,7 +15230,6 @@
 "callgrindcostitem.h"	"5"
 "callgrindcycledetection.h"	"5"
 "callgrinddatamodel.h"	"5"
-"callgrindfunction.h"	"5"
 "callgrindfunction_p.h"	"5"
 "callgrindfunctioncall.h"	"5"
 "callgrindfunctioncycle.h"	"5"
@@ -15782,7 +15303,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15797,7 +15317,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Valgrind.json.in"	"6"
 "xmlprotocol"	"3"
 "xmlprotocol.pri"	"4"
 "Headers"	"4"
@@ -15917,7 +15436,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -15932,7 +15450,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"VcsBase.json.in"	"6"
 "Headers"	"3"
 "wizard"	"4"
 "vcscommandpage.h"	"5"
@@ -16048,7 +15565,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -16061,7 +15577,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"WebAssembly.json.in"	"6"
 "Headers"	"3"
 "webassembly_global.h"	"4"
 "webassemblyconstants.h"	"4"
@@ -16115,7 +15630,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "rpath"	"4"
@@ -16126,7 +15640,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"Welcome.json.in"	"6"
 "Headers"	"3"
 "introductionwidget.h"	"4"
 "Sources"	"3"
@@ -16145,8 +15658,6 @@
 "download@2x.png"	"7"
 "expandarrow.png"	"7"
 "expandarrow@2x.png"	"7"
-"mode_welcome.png"	"7"
-"mode_welcome@2x.png"	"7"
 "mode_welcome_mask.png"	"7"
 "mode_welcome_mask@2x.png"	"7"
 "new.png"	"7"
@@ -16222,7 +15733,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "qtsupport_dependencies"	"4"
@@ -16235,7 +15745,6 @@
 "shared"	"5"
 "qtcreator_gui_pch.h"	"6"
 "Other files"	"4"
-"WinRt.json.in"	"6"
 "Headers"	"3"
 "winrtconstants.h"	"4"
 "winrtdebugsupport.h"	"4"
@@ -16326,7 +15835,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"3"
@@ -16469,11 +15977,9 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"3"
-"crashhandlersetup.h"	"5"
 "Sources"	"3"
 "crashhandlersetup.cpp"	"5"
 "clangbackendmain.cpp"	"4"
@@ -16498,7 +16004,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"3"
@@ -16530,7 +16035,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"3"
@@ -16865,7 +16369,6 @@
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"4"
-"qtcreator_pch.h"	"6"
 "qtcreator"	"3"
 "qtcreator.pri"	"4"
 "qtcreator_ide_branding"	"4"
@@ -16873,7 +16376,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "Other files"	"3"
 "qml2puppet.qbs"	"4"
 "qtc-askpass"	"2"
@@ -16887,15 +16389,12 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Sources"	"3"
 "qtc-askpass-main.cpp"	"4"
 "Other files"	"3"
 "qtc-askpass.qbs"	"4"
-"qtpromaker"	"2"
-"qtpromaker.pro"	"3"
 "qtcreatortool"	"3"
 "qtcreatortool.pri"	"4"
 "qtcreator"	"4"
@@ -16905,7 +16404,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Sources"	"3"
@@ -16923,7 +16421,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "rpath"	"4"
 "rpath.pri"	"5"
 "Headers"	"3"
@@ -17008,7 +16505,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "Headers"	"3"
 "outputgenerator.h"	"4"
 "Sources"	"3"
@@ -17038,7 +16534,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -17056,7 +16551,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -17077,7 +16571,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -17125,7 +16618,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17171,7 +16663,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17219,7 +16710,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"4"
@@ -17268,7 +16758,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17314,7 +16803,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17361,7 +16849,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17416,7 +16903,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17462,7 +16948,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"4"
@@ -17511,7 +16996,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"4"
@@ -17560,7 +17044,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17606,7 +17089,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17671,10 +17153,6 @@
 "identifier-expansion.4.out.cpp"	"6"
 "identifier-expansion.5.cpp"	"6"
 "identifier-expansion.5.out.cpp"	"6"
-"macro-test.cpp"	"6"
-"macro-test.out.cpp"	"6"
-"macro_expand.c"	"6"
-"macro_expand.out.c"	"6"
 "macro_expand_1.cpp"	"6"
 "macro_expand_1.out.cpp"	"6"
 "macro_pounder_fn.c"	"6"
@@ -17725,7 +17203,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17771,7 +17248,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"4"
@@ -17820,7 +17296,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"4"
@@ -17840,7 +17315,6 @@
 "qtcreator_testvars"	"6"
 "qtcreator_testvars.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -17861,14 +17335,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
-"debuggerprotocol.h"	"6"
-"simplifytype.h"	"6"
-"watchdata.h"	"6"
-"watchutils.h"	"6"
 "Sources"	"4"
 "debuggerprotocol.cpp"	"6"
 "simplifytype.cpp"	"6"
@@ -17890,11 +17359,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
-"debuggerprotocol.h"	"6"
 "Sources"	"4"
 "debuggerprotocol.cpp"	"6"
 "tst_gdb.cpp"	"5"
@@ -17911,7 +17378,6 @@
 "qtcreator_testvars"	"6"
 "qtcreator_testvars.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -17931,11 +17397,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
-"debuggerprotocol.h"	"6"
 "Sources"	"4"
 "debuggerprotocol.cpp"	"6"
 "tst_protocol.cpp"	"5"
@@ -17952,7 +17416,6 @@
 "qtcreator_testvars"	"6"
 "qtcreator_testvars.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -17975,7 +17438,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -17995,7 +17457,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18023,7 +17484,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"6"
@@ -18047,7 +17507,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"6"
@@ -18071,7 +17530,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"6"
@@ -18099,7 +17557,6 @@
 "utils_dependencies"	"8"
 "utils_dependencies.pri"	"9"
 "Other files"	"8"
-"CMakeLists.txt"	"10"
 "qttestrpath"	"7"
 "qttestrpath.pri"	"8"
 "Headers"	"6"
@@ -18125,7 +17582,6 @@
 "utils_dependencies"	"8"
 "utils_dependencies.pri"	"9"
 "Other files"	"8"
-"CMakeLists.txt"	"10"
 "qttestrpath"	"7"
 "qttestrpath.pri"	"8"
 "Headers"	"6"
@@ -18151,7 +17607,6 @@
 "utils_dependencies"	"8"
 "utils_dependencies.pri"	"9"
 "Other files"	"8"
-"CMakeLists.txt"	"10"
 "qttestrpath"	"7"
 "qttestrpath.pri"	"8"
 "Headers"	"6"
@@ -18177,7 +17632,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -18203,7 +17657,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -18218,10 +17671,7 @@
 "testdir"	"6"
 "spec.json"	"7"
 "testspecs"	"6"
-"simplespec.json"	"7"
 "simplespec_experimental.json"	"7"
-"spec1.json"	"7"
-"spec2.json"	"7"
 "spec_wrong2.json"	"7"
 "spec_wrong3.json"	"7"
 "spec_wrong4.json"	"7"
@@ -18242,11 +17692,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"5"
-"testplugin.h"	"6"
 "testplugin_global.h"	"6"
 "Sources"	"5"
 "testplugin.cpp"	"6"
@@ -18272,11 +17720,9 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Headers"	"3"
-"externaltool.h"	"5"
 "Sources"	"3"
 "externaltool.cpp"	"5"
 "tst_externaltooltest.cpp"	"4"
@@ -18295,7 +17741,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18338,7 +17783,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18358,7 +17802,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18377,7 +17820,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18395,7 +17837,6 @@
 "proitems.h"	"5"
 "prowriter.h"	"5"
 "qmake_global.h"	"5"
-"qmakeevaluator.h"	"5"
 "qmakeevaluator_p.h"	"5"
 "qmakeglobals.h"	"5"
 "qmakeparser.h"	"5"
@@ -18428,7 +17869,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -18462,7 +17902,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -18516,7 +17955,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -18602,20 +18040,11 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
 "tst_ecmascript7.cpp"	"6"
 "Other files"	"5"
-"arrow-functions.js"	"7"
-"class.js"	"7"
-"constructor.js"	"7"
-"extends.js"	"7"
-"let.js"	"7"
-"super.js"	"7"
-"template-strings.js"	"7"
-"yield.js"	"7"
 "importscheck"	"4"
 "importscheck.pro"	"5"
 "languageutils-lib"	"5"
@@ -18743,7 +18172,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -18773,7 +18201,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
@@ -19200,7 +18627,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Headers"	"5"
@@ -19275,7 +18701,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "Sources"	"5"
@@ -19305,7 +18730,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19347,7 +18771,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "utils_dependencies"	"5"
@@ -19369,7 +18792,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19399,7 +18821,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19426,7 +18847,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -19445,7 +18865,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -19467,7 +18886,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -19485,7 +18903,6 @@
 "qtcreator_testvars"	"5"
 "qtcreator_testvars.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -19509,7 +18926,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19531,7 +18947,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
@@ -19551,7 +18966,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "timelineabstractrenderer"	"3"
 "timelineabstractrenderer.pro"	"4"
 "qttest"	"4"
@@ -19567,7 +18981,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19589,7 +19002,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19611,7 +19023,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19633,7 +19044,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19655,7 +19065,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19677,7 +19086,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19699,7 +19107,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19721,7 +19128,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19743,7 +19149,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19765,7 +19170,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19787,7 +19191,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19809,7 +19212,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19838,7 +19240,6 @@
 "utils_dependencies"	"5"
 "utils_dependencies.pri"	"6"
 "Other files"	"5"
-"CMakeLists.txt"	"7"
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Sources"	"3"
@@ -19860,7 +19261,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19880,7 +19280,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19900,7 +19299,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19920,7 +19318,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19940,7 +19337,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19960,7 +19356,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -19980,7 +19375,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -20000,7 +19394,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -20020,7 +19413,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -20040,7 +19432,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -20060,7 +19451,6 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Sources"	"4"
@@ -20120,7 +19510,6 @@
 "utils_dependencies"	"7"
 "utils_dependencies.pri"	"8"
 "Other files"	"7"
-"CMakeLists.txt"	"9"
 "qttestrpath"	"6"
 "qttestrpath.pri"	"7"
 "valgrind_test"	"5"
@@ -20132,7 +19521,6 @@
 "callgrindcostitem.h"	"8"
 "callgrindcycledetection.h"	"8"
 "callgrinddatamodel.h"	"8"
-"callgrindfunction.h"	"8"
 "callgrindfunction_p.h"	"8"
 "callgrindfunctioncall.h"	"8"
 "callgrindfunctioncycle.h"	"8"
@@ -20245,7 +19633,6 @@
 "callgrindcostitem.h"	"8"
 "callgrindcycledetection.h"	"8"
 "callgrinddatamodel.h"	"8"
-"callgrindfunction.h"	"8"
 "callgrindfunction_p.h"	"8"
 "callgrindfunctioncall.h"	"8"
 "callgrindfunctioncycle.h"	"8"
@@ -20385,10 +19772,6 @@
 "qttestrpath"	"4"
 "qttestrpath.pri"	"5"
 "Headers"	"3"
-"hostosinfo.h"	"6"
-"qtcassert.h"	"6"
-"fakevimactions.h"	"6"
-"fakevimhandler.h"	"6"
 "Sources"	"3"
 "hostosinfo.cpp"	"6"
 "qtcassert.cpp"	"6"
@@ -20500,16 +19883,6 @@
 "testreader"	"2"
 "testreader.pro"	"3"
 "Headers"	"3"
-"ioutils.h"	"5"
-"profileevaluator.h"	"5"
-"proitems.h"	"5"
-"qmake_global.h"	"5"
-"qmakeevaluator.h"	"5"
-"qmakeevaluator_p.h"	"5"
-"qmakeglobals.h"	"5"
-"qmakeparser.h"	"5"
-"qmakevfs.h"	"5"
-"registry_p.h"	"5"
 "Sources"	"3"
 "ioutils.cpp"	"5"
 "profileevaluator.cpp"	"5"
@@ -20548,11 +19921,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
-"themeselector.h"	"6"
 "Sources"	"4"
 "themeselector.cpp"	"6"
 "tst_manual_widgets_crumblepath.cpp"	"5"
@@ -20563,7 +19934,6 @@
 "design.creatortheme"	"7"
 "flat-dark.creatortheme"	"7"
 "flat-light.creatortheme"	"7"
-"flat.creatortheme"	"7"
 "Other files"	"4"
 "crumblepath.qbs"	"5"
 "infolabel"	"3"
@@ -20585,11 +19955,9 @@
 "utils_dependencies"	"6"
 "utils_dependencies.pri"	"7"
 "Other files"	"6"
-"CMakeLists.txt"	"8"
 "qttestrpath"	"5"
 "qttestrpath.pri"	"6"
 "Headers"	"4"
-"themeselector.h"	"6"
 "Sources"	"4"
 "themeselector.cpp"	"6"
 "tst_manual_widgets_infolabel.cpp"	"5"
@@ -20600,7 +19968,6 @@
 "design.creatortheme"	"7"
 "flat-dark.creatortheme"	"7"
 "flat-light.creatortheme"	"7"
-"flat.creatortheme"	"7"
 "Other files"	"4"
 "infolabel.qbs"	"5"
 "tools"	"1"
@@ -20740,7 +20107,6 @@
 "qtcreator_testvars"	"4"
 "qtcreator_testvars.pri"	"5"
 "Other files"	"4"
-"CMakeLists.txt"	"6"
 "sqlite-lib"	"3"
 "sqlite-lib.pri"	"4"
 "sqlite"	"4"
@@ -20799,13 +20165,11 @@
 "mimetypes"	"4"
 "mimetypes.pri"	"5"
 "Headers"	"5"
-"mimedatabase.h"	"6"
 "mimedatabase_p.h"	"6"
 "mimeglobpattern_p.h"	"6"
 "mimemagicrule_p.h"	"6"
 "mimemagicrulematcher_p.h"	"6"
 "mimeprovider_p.h"	"6"
-"mimetype.h"	"6"
 "mimetype_p.h"	"6"
 "mimetypeparser_p.h"	"6"
 "Sources"	"5"
@@ -20829,7 +20193,6 @@
 "variant"	"6"
 "variant.hpp"	"7"
 "theme"	"5"
-"theme.h"	"6"
 "theme_p.h"	"6"
 "tooltip"	"5"
 "effects.h"	"6"
@@ -21202,20 +20565,12 @@
 "collapse@2x.png"	"8"
 "compile_error_taskbar.png"	"8"
 "compile_error_taskbar@2x.png"	"8"
-"crumblepath-segment-first-hover.png"	"8"
-"crumblepath-segment-first-hover@2x.png"	"8"
 "crumblepath-segment-first.png"	"8"
 "crumblepath-segment-first@2x.png"	"8"
-"crumblepath-segment-last-hover.png"	"8"
-"crumblepath-segment-last-hover@2x.png"	"8"
 "crumblepath-segment-last.png"	"8"
 "crumblepath-segment-last@2x.png"	"8"
-"crumblepath-segment-middle-hover.png"	"8"
-"crumblepath-segment-middle-hover@2x.png"	"8"
 "crumblepath-segment-middle.png"	"8"
 "crumblepath-segment-middle@2x.png"	"8"
-"crumblepath-segment-single-hover.png"	"8"
-"crumblepath-segment-single-hover@2x.png"	"8"
 "crumblepath-segment-single.png"	"8"
 "crumblepath-segment-single@2x.png"	"8"
 "dark_fileicon.png"	"8"
@@ -21264,26 +20619,18 @@
 "fittoview@2x.png"	"8"
 "home.png"	"8"
 "home@2x.png"	"8"
-"iconoverlay_add.png"	"8"
-"iconoverlay_add@2x.png"	"8"
 "iconoverlay_add_background.png"	"8"
 "iconoverlay_add_background@2x.png"	"8"
 "iconoverlay_add_small.png"	"8"
 "iconoverlay_add_small@2x.png"	"8"
-"iconoverlay_error.png"	"8"
-"iconoverlay_error@2x.png"	"8"
 "iconoverlay_error_background.png"	"8"
 "iconoverlay_error_background@2x.png"	"8"
 "iconoverlay_reset.png"	"8"
 "iconoverlay_reset@2x.png"	"8"
-"iconoverlay_warning.png"	"8"
-"iconoverlay_warning@2x.png"	"8"
 "iconoverlay_warning_background.png"	"8"
 "iconoverlay_warning_background@2x.png"	"8"
 "info.png"	"8"
 "info@2x.png"	"8"
-"inputfield.png"	"8"
-"inputfield@2x.png"	"8"
 "inputfield_disabled.png"	"8"
 "inputfield_disabled@2x.png"	"8"
 "interrupt_small.png"	"8"
@@ -21318,10 +20665,6 @@
 "online@2x.png"	"8"
 "pan.png"	"8"
 "pan@2x.png"	"8"
-"panel_button.png"	"8"
-"panel_button@2x.png"	"8"
-"panel_button_checked.png"	"8"
-"panel_button_checked@2x.png"	"8"
 "panel_button_checked_hover.png"	"8"
 "panel_button_checked_hover@2x.png"	"8"
 "panel_button_hover.png"	"8"
@@ -21719,13 +21062,11 @@
 "mimetypes"	"5"
 "mimetypes.pri"	"6"
 "Headers"	"6"
-"mimedatabase.h"	"7"
 "mimedatabase_p.h"	"7"
 "mimeglobpattern_p.h"	"7"
 "mimemagicrule_p.h"	"7"
 "mimemagicrulematcher_p.h"	"7"
 "mimeprovider_p.h"	"7"
-"mimetype.h"	"7"
 "mimetype_p.h"	"7"
 "mimetypeparser_p.h"	"7"
 "Sources"	"6"
@@ -21749,7 +21090,6 @@
 "variant"	"7"
 "variant.hpp"	"8"
 "theme"	"6"
-"theme.h"	"7"
 "theme_p.h"	"7"
 "tooltip"	"6"
 "effects.h"	"7"
@@ -22122,20 +21462,12 @@
 "collapse@2x.png"	"9"
 "compile_error_taskbar.png"	"9"
 "compile_error_taskbar@2x.png"	"9"
-"crumblepath-segment-first-hover.png"	"9"
-"crumblepath-segment-first-hover@2x.png"	"9"
 "crumblepath-segment-first.png"	"9"
 "crumblepath-segment-first@2x.png"	"9"
-"crumblepath-segment-last-hover.png"	"9"
-"crumblepath-segment-last-hover@2x.png"	"9"
 "crumblepath-segment-last.png"	"9"
 "crumblepath-segment-last@2x.png"	"9"
-"crumblepath-segment-middle-hover.png"	"9"
-"crumblepath-segment-middle-hover@2x.png"	"9"
 "crumblepath-segment-middle.png"	"9"
 "crumblepath-segment-middle@2x.png"	"9"
-"crumblepath-segment-single-hover.png"	"9"
-"crumblepath-segment-single-hover@2x.png"	"9"
 "crumblepath-segment-single.png"	"9"
 "crumblepath-segment-single@2x.png"	"9"
 "dark_fileicon.png"	"9"
@@ -22184,26 +21516,18 @@
 "fittoview@2x.png"	"9"
 "home.png"	"9"
 "home@2x.png"	"9"
-"iconoverlay_add.png"	"9"
-"iconoverlay_add@2x.png"	"9"
 "iconoverlay_add_background.png"	"9"
 "iconoverlay_add_background@2x.png"	"9"
 "iconoverlay_add_small.png"	"9"
 "iconoverlay_add_small@2x.png"	"9"
-"iconoverlay_error.png"	"9"
-"iconoverlay_error@2x.png"	"9"
 "iconoverlay_error_background.png"	"9"
 "iconoverlay_error_background@2x.png"	"9"
 "iconoverlay_reset.png"	"9"
 "iconoverlay_reset@2x.png"	"9"
-"iconoverlay_warning.png"	"9"
-"iconoverlay_warning@2x.png"	"9"
 "iconoverlay_warning_background.png"	"9"
 "iconoverlay_warning_background@2x.png"	"9"
 "info.png"	"9"
 "info@2x.png"	"9"
-"inputfield.png"	"9"
-"inputfield@2x.png"	"9"
 "inputfield_disabled.png"	"9"
 "inputfield_disabled@2x.png"	"9"
 "interrupt_small.png"	"9"
@@ -22238,10 +21562,6 @@
 "online@2x.png"	"9"
 "pan.png"	"9"
 "pan@2x.png"	"9"
-"panel_button.png"	"9"
-"panel_button@2x.png"	"9"
-"panel_button_checked.png"	"9"
-"panel_button_checked@2x.png"	"9"
 "panel_button_checked_hover.png"	"9"
 "panel_button_checked_hover@2x.png"	"9"
 "panel_button_hover.png"	"9"
@@ -22339,10 +21659,8 @@
 "detail"	"8"
 "bool_type.h"	"9"
 "impl.h"	"9"
-"iterator.h"	"9"
 "iterator_fwd.h"	"9"
 "memory.h"	"9"
-"node.h"	"9"
 "node_data.h"	"9"
 "node_iterator.h"	"9"
 "node_ref.h"	"9"
@@ -22407,7 +21725,6 @@
 "exceptions.cpp"	"7"
 "exp.cpp"	"7"
 "memory.cpp"	"7"
-"node.cpp"	"7"
 "node_data.cpp"	"7"
 "nodebuilder.cpp"	"7"
 "nodeevents.cpp"	"7"
@@ -22440,7 +21757,6 @@
 "eventspy.h"	"4"
 "fakeprocess.h"	"4"
 "filesystem-utilities.h"	"4"
-"google-using-declarations.h"	"4"
 "googletest.h"	"4"
 "gtest-creator-printing.h"	"4"
 "gtest-llvm-printing.h"	"4"
@@ -22493,18 +21809,15 @@
 "nodelistproperty-test.cpp"	"4"
 "processcreator-test.cpp"	"4"
 "processevents-utilities.cpp"	"4"
-"projectstorage-test.cpp"	"4"
 "projectstoragesqlitefunctionregistry-test.cpp"	"4"
 "readandwritemessageblock-test.cpp"	"4"
 "sizedarray-test.cpp"	"4"
 "smallstring-test.cpp"	"4"
-"sourcepath-test.cpp"	"4"
 "sourcepathcache-test.cpp"	"4"
 "sourcepathview-test.cpp"	"4"
 "spydummy.cpp"	"4"
 "sqlitealgorithms-test.cpp"	"4"
 "sqlitecolumn-test.cpp"	"4"
-"sqlitedatabase-test.cpp"	"4"
 "sqlitedatabasebackend-test.cpp"	"4"
 "sqliteindex-test.cpp"	"4"
 "sqlitereadstatementmock.cpp"	"4"
@@ -22523,15 +21836,12 @@
 "Other files"	"3"
 "data"	"4"
 "complete_arrow.cpp"	"5"
-"complete_completer_main.cpp"	"5"
 "complete_completer_main_unsaved.cpp"	"5"
 "complete_extractor_brief_comment.cpp"	"5"
 "complete_extractor_class.cpp"	"5"
 "complete_extractor_constructor.cpp"	"5"
 "complete_extractor_constructorMemberInitialization.cpp"	"5"
 "complete_extractor_enumeration.cpp"	"5"
-"complete_extractor_function.cpp"	"5"
-"complete_extractor_function_unsaved.cpp"	"5"
 "complete_extractor_function_unsaved_2.cpp"	"5"
 "complete_extractor_functionoverload.cpp"	"5"
 "complete_extractor_namespace.cpp"	"5"
@@ -22540,13 +21850,11 @@
 "complete_forwarding_header_1.h"	"5"
 "complete_forwarding_header_2.h"	"5"
 "complete_smartpointer.cpp"	"5"
-"complete_target_header.h"	"5"
 "complete_target_header_changed.h"	"5"
 "complete_target_header_unsaved.h"	"5"
 "complete_testfile_1.cpp"	"5"
 "complete_translationunit_parse_error.cpp"	"5"
 "complete_withDotArrowCorrectionForForwardDeclaredClassPointer.cpp"	"5"
-"complete_withDotArrowCorrectionForPointer.cpp"	"5"
 "complete_withDotArrowCorrectionForPointer_afterTyping.cpp"	"5"
 "complete_withDotArrowCorrectionForPointer_beforeTyping.cpp"	"5"
 "complete_withDotArrowCorrectionForPointerInitial.cpp"	"5"
@@ -22562,16 +21870,13 @@
 "completions_order.cpp"	"5"
 "cursor.cpp"	"5"
 "cursor.h"	"5"
-"diagnostic_comparison_fixit.cpp"	"5"
 "diagnostic_comparison_fixit_expected1.cpp"	"5"
 "diagnostic_comparison_fixit_expected2.cpp"	"5"
 "diagnostic_diagnostic.cpp"	"5"
-"diagnostic_diagnosticset.cpp"	"5"
 "diagnostic_diagnosticset_header.cpp"	"5"
 "diagnostic_diagnosticset_mainfile.cpp"	"5"
 "diagnostic_erroneous_header.h"	"5"
 "diagnostic_erroneous_source.cpp"	"5"
-"diagnostic_semicolon_fixit.cpp"	"5"
 "diagnostic_semicolon_fixit_expected.cpp"	"5"
 "diagnostic_source_location.cpp"	"5"
 "diagnostic_source_range.cpp"	"5"
@@ -22657,26 +21962,6 @@
 "changes-4.0.2.md"	"2"
 "changes-4.0.3.md"	"2"
 "changes-4.1.0.md"	"2"
-"changes-4.10.0.md"	"2"
-"changes-4.10.1.md"	"2"
-"changes-4.11.0.md"	"2"
-"changes-4.11.1.md"	"2"
-"changes-4.11.2.md"	"2"
-"changes-4.12.0.md"	"2"
-"changes-4.12.1.md"	"2"
-"changes-4.12.2.md"	"2"
-"changes-4.12.3.md"	"2"
-"changes-4.12.4.md"	"2"
-"changes-4.13.0.md"	"2"
-"changes-4.13.1.md"	"2"
-"changes-4.13.2.md"	"2"
-"changes-4.13.3.md"	"2"
-"changes-4.14.0.md"	"2"
-"changes-4.14.1.md"	"2"
-"changes-4.14.2.md"	"2"
-"changes-4.15.0.md"	"2"
-"changes-4.15.1.md"	"2"
-"changes-4.15.2.md"	"2"
 "changes-4.2.0.md"	"2"
 "changes-4.2.1.md"	"2"
 "changes-4.2.2.md"	"2"
@@ -22699,6 +21984,26 @@
 "changes-4.9.0.md"	"2"
 "changes-4.9.1.md"	"2"
 "changes-4.9.2.md"	"2"
+"changes-4.10.0.md"	"2"
+"changes-4.10.1.md"	"2"
+"changes-4.11.0.md"	"2"
+"changes-4.11.1.md"	"2"
+"changes-4.11.2.md"	"2"
+"changes-4.12.0.md"	"2"
+"changes-4.12.1.md"	"2"
+"changes-4.12.2.md"	"2"
+"changes-4.12.3.md"	"2"
+"changes-4.12.4.md"	"2"
+"changes-4.13.0.md"	"2"
+"changes-4.13.1.md"	"2"
+"changes-4.13.2.md"	"2"
+"changes-4.13.3.md"	"2"
+"changes-4.14.0.md"	"2"
+"changes-4.14.1.md"	"2"
+"changes-4.14.2.md"	"2"
+"changes-4.15.0.md"	"2"
+"changes-4.15.1.md"	"2"
+"changes-4.15.2.md"	"2"
 "changes-5.0.0.md"	"2"
 "changes-5.0.1.md"	"2"
 "changes-5.0.2.md"	"2"
@@ -22736,7 +22041,6 @@
 "sqlite_sources"	"3"
 "sqlite-sources.qbs"	"4"
 "scripts"	"1"
-"build.py"	"2"
 "build_plugin.py"	"2"
 "checkInstalledFiles.py"	"2"
 "clangCompleteAt.sh"	"2"
diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py
index e60c754e923..c72d86a4e2e 100644
--- a/tests/system/suite_tools/tst_designer_autocomplete/test.py
+++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py
@@ -8,8 +8,13 @@ def main():
     if not startedWithoutPluginError():
         return
     projectName = "DesignerTestApp"
-    createProject_Qt_GUI(tempDir(), projectName,
-                         buildSystem="qmake" if JIRA.isBugStillOpen(28787) else "CMake")
+    # explicitly chose new kit to avoid compiler issues on Windows
+    targets = createProject_Qt_GUI(tempDir(), projectName, buildSystem="CMake",
+                                   targets=[Targets.DESKTOP_6_2_4])
+    if len(targets) != 1:
+        earlyExit()
+        return
+
     invokeMenuItem('Build', 'Build Project "%s"' % projectName)
     selectFromLocator("mainwindow.ui")
     dragAndDrop(waitForObject("{container=':qdesigner_internal::WidgetBoxCategoryListView'"