Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
This commit is contained in:
Eike Ziller
2016-04-15 10:07:49 +02:00
193 changed files with 966 additions and 1553 deletions

View File

@@ -85,7 +85,7 @@ public:
DebuggerEngineType masterEngineType = NoEngineType;
DebuggerEngineType cppEngineType = NoEngineType;
DebuggerLanguages languages = AnyLanguage;
DebuggerLanguages languages = NoLanguage;
bool breakOnMain = false;
bool multiProcess = false; // Whether to set detach-on-fork off.