feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/libs/utils/theme/theme_mac.mm
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/debugger/lldb/lldbengine.cpp

Change-Id: I5f2c62e0bce6c91a53a554b3278dbe23ff7dde36
This commit is contained in:
Eike Ziller
2021-11-11 11:54:41 +01:00
parent aac740f127 c97a144034
commit 164aae53d2
129 changed files with 4084 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4011,7 +4011,10 @@ void GdbEngine::setupEngine()
if (!commands.isEmpty())
runCommand({commands});
runCommand({"setFallbackQtVersion(0x" + QString::number(rp.fallbackQtVersion, 16) + ")"});
DebuggerCommand cmd1("setFallbackQtVersion");
cmd1.arg("version", rp.fallbackQtVersion);
runCommand(cmd1);
runCommand({"loadDumpers", CB(handlePythonSetup)});
// Reload peripheral register description.