Merge remote-tracking branch 'origin/4.14'

Change-Id: I70504e096be620434f38cd990c593950da8b24ba
2021-01-07 15:20:42 +01:00
parent f1268a9f86 19970878b8
commit b801a9339d
90 changed files with 17798 additions and 12611 deletions
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4119,10 +4119,7 @@ void GdbEngine::setupInferior()
        if (symbolFile.isEmpty()) {
            showMessage(tr("No symbol file given."), StatusBar);
            callTargetRemote();
-            return;
-        }
-
-        if (!symbolFile.isEmpty()) {
+        } else {
            runCommand({"-file-exec-and-symbols \"" + symbolFile + '"',
                        CB(handleFileExecAndSymbols)});
        }