Merge remote-tracking branch 'origin/11.0'

Change-Id: Icb3ed8a1aaf31e8201a61d04221bfcb23a78562a
2023-06-22 12:42:43 +02:00
parent 87861cf7ee 369cba84bb
commit 6479785c20
78 changed files with 1255 additions and 328 deletions
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -236,11 +236,11 @@ public:

        const auto onCheckerSetup = [this](Async<ArchiveIssue> &async) {
            if (!m_tempDir)
-                return TaskAction::StopWithError;
+                return SetupResult::StopWithError;

            async.setConcurrentCallData(checkContents, m_tempDir->path());
            async.setFutureSynchronizer(PluginManager::futureSynchronizer());
-            return TaskAction::Continue;
+            return SetupResult::Continue;
        };
        const auto onCheckerDone = [this](const Async<ArchiveIssue> &async) {
            m_isComplete = !async.isResultAvailable();