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

Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
parent 3299239095 c78f9352d2
commit 2a05186194
138 changed files with 4023 additions and 3663 deletions
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -397,6 +397,8 @@ void CdbEngine::setupEngine()

    debugger.addArgs({"-y", QChar('"') + stringListSetting(CdbSymbolPaths).join(';') + '"'});

+    debugger.addArgs(expand(stringSetting(CdbAdditionalArguments)), CommandLine::Raw);
+
    switch (sp.startMode) {
    case StartInternal:
    case StartExternal: