Merge remote-tracking branch 'origin/4.13' into master

Conflicts:
	src/plugins/languageclient/languageclientcompletionassist.cpp

Change-Id: If12e1c532e5623ef063681309a918e7b51117b1c

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp

@@ -260,7 +260,7 @@ void NodeInstanceServer::setRenderTimerInterval(int timerInterval)
 
 void NodeInstanceServer::setSlowRenderTimerInterval(int timerInterval)
 {
-    m_slowRenderTimerInterval = timerInterval;
+    m_timerModeInterval = timerInterval;
 }
 
 void NodeInstanceServer::setTimerId(int timerId)
@@ -280,29 +280,31 @@ int NodeInstanceServer::renderTimerInterval() const
 
 void NodeInstanceServer::startRenderTimer()
 {
-    if (m_slowRenderTimer)
+    if (m_timerMode == TimerMode::SlowTimer)
         stopRenderTimer();
 
+    if (m_timerMode == TimerMode::DisableTimer)
+        return;
+
     if (m_timer == 0)
         m_timer = startTimer(m_renderTimerInterval);
 
-    m_slowRenderTimer = false;
+    m_timerMode = TimerMode::NormalTimer;
 }
 
 void NodeInstanceServer::slowDownRenderTimer()
 {
-    if (!m_slowRenderTimer)
-        stopRenderTimer();
-
     if (m_timer != 0) {
         killTimer(m_timer);
         m_timer = 0;
     }
 
-    if (m_timer == 0)
-        m_timer = startTimer(m_slowRenderTimerInterval);
+    if (m_timerMode == TimerMode::DisableTimer)
+        return;
 
-    m_slowRenderTimer = true;
+    m_timer = startTimer(m_timerModeInterval);
+
+    m_timerMode = TimerMode::SlowTimer;
 }
 
 void NodeInstanceServer::stopRenderTimer()
@@ -1448,4 +1450,9 @@ void NodeInstanceServer::handleExtraRender()
     }
 }
 
+void NodeInstanceServer::disableTimer()
+{
+    m_timerMode = TimerMode::DisableTimer;
+}
+
 } // namespace QmlDesigner