Merge remote-tracking branch 'origin/12.0'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
	src/plugins/remotelinux/killappstep.cpp

Change-Id: Ife961ca4eb14271c48bd0dbc08e0a0a816935682

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -23,6 +23,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <projectexplorer/buildmanager.h>
 #include <projectexplorer/extracompiler.h>
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
@@ -1585,7 +1586,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);

src/plugins/languageclient/languageclientcompletionassist.cpp

@@ -317,7 +317,7 @@ public:
         });
 
         setProposal(m_processor->start(std::move(interface)), prefix);
-        if (!m_processor->running()) {
+        if (m_processor && !m_processor->running()) {
             delete m_processor;
             m_processor = nullptr;
         }

src/plugins/projectexplorer/runcontrol.cpp

@@ -1303,16 +1303,18 @@ void SimpleTargetRunnerPrivate::stop()
         m_stopRequested = true;
         q->appendMessage(Tr::tr("User requested stop. Shutting down..."), NormalMessageFormat);
         switch (m_state) {
-            case Run:
+        case Run:
-                m_process.stop();
+            m_process.stop();
-                if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
+            if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
-                    QTC_CHECK(false); // Shouldn't happen, just emergency handling
+                q->appendMessage(Tr::tr("Remote process did not finish in time. "
-                    m_process.close();
+                                        "Connectivity lost?"), ErrorMessageFormat);
-                    forwardDone();
+                m_process.close();
-                }
+                m_state = Inactive;
-                break;
+                forwardDone();
-            case Inactive:
+            }
-                break;
+            break;
+        case Inactive:
+            break;
         }
     }
 }

src/plugins/remotelinux/killappstep.cpp

@@ -59,6 +59,7 @@ GroupItem KillAppStep::deployRecipe()
         const QString message = result == DoneWith::Success ? Tr::tr("Remote application killed.")
             : Tr::tr("Failed to kill remote application. Assuming it was not running.");
         addProgressMessage(message);
+        return DoneResult::Success;
     };
     return DeviceProcessKillerTask(onSetup, onDone);
 }

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"

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();

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>

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 {

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