Merge remote-tracking branch 'origin/4.14'

Change-Id: I26a53ef81a54a2f7aa482448118298895b712941
2021-01-12 14:14:41 +01:00
parent dedae466fd 4231a88b67
commit 7ce3ceabe9
12 changed files with 68 additions and 29 deletions
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4150,6 +4150,9 @@ void GdbEngine::setupInferior()
        // Do that first, otherwise no symbols are loaded.
        QFileInfo fi = executable.toFileInfo();
        QString path = fi.absoluteFilePath();
+        // This is *not* equivalent to -file-exec-and-symbols. If the file is not executable
+        // (contains only debugging symbols), this should still work.
+        runCommand({"-file-exec-file \"" + path + '"'});
        runCommand({"-file-symbol-file \"" + path + '"',
                    CB(handleFileExecAndSymbols)});