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

Debugger: Fix C++20 complaint about or-ing different enums

Browse Source 
Change-Id: Ie3648b3473476c3f71339006dff2c5dccf817b15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2024-02-20 13:43:05 +01:00
parent fb2b861fb7
commit 8893e5f14a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -2781,7 +2781,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
showMessage("Reading " + codeFile.toUserOutput(), LogInput); showMessage("Reading " + codeFile.toUserOutput(), LogInput);
runCommand({QString("module = types.ModuleType('%1')").arg(module), ScriptCommand}); runCommand({QString("module = types.ModuleType('%1')").arg(module), ScriptCommand});
runCommand({QString("code = bytes.fromhex('%1').decode('utf-8')") runCommand({QString("code = bytes.fromhex('%1').decode('utf-8')")
.arg(QString::fromUtf8(code->toHex())), ScriptCommand | DebuggerCommand::Silent}); .arg(QString::fromUtf8(code->toHex())), ScriptCommand | Silent});
runCommand({QString("exec(code, module.__dict__)"), ScriptCommand}); runCommand({QString("exec(code, module.__dict__)"), ScriptCommand});
runCommand({QString("sys.modules['%1'] = module").arg(module), ScriptCommand}); runCommand({QString("sys.modules['%1'] = module").arg(module), ScriptCommand});
runCommand({QString("import %1").arg(module), ScriptCommand}); runCommand({QString("import %1").arg(module), ScriptCommand});

1
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -110,6 +110,7 @@ private:
}; };
enum CommandFlags { enum CommandFlags {
NoFlags = 0, NoFlags = 0,
Silent = DebuggerCommand::Silent,
BuiltinCommand = DebuggerCommand::Silent << 1, BuiltinCommand = DebuggerCommand::Silent << 1,
ExtensionCommand = DebuggerCommand::Silent << 2, ExtensionCommand = DebuggerCommand::Silent << 2,
ScriptCommand = DebuggerCommand::Silent << 3 ScriptCommand = DebuggerCommand::Silent << 3