Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
2016-04-15 10:07:49 +02:00
parent 0338f6909c 7080645d20
commit 8a77eacf8d
193 changed files with 966 additions and 1553 deletions
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -144,6 +144,12 @@ QString DebuggerRunControl::displayName() const
    return m_engine->runParameters().displayName;
 }

+bool DebuggerRunControl::supportsReRunning() const
+{
+    // QML and/or mixed are not prepared for it.
+    return m_engine && !(m_engine->runParameters().languages & QmlLanguage);
+}
+
 void DebuggerRunControl::start()
 {
    Debugger::Internal::saveModeToRestore();