commit 2e437c8e32c1ad73d86b377dc09f7b6cba9a019b
Author: Enrico Forestieri <[email protected]>
Date: Wed Jun 3 11:37:17 2026 +0200
Amend 2c70cdad364
Fix the following compile error on Windows:
../../../../src/frontends/qt/GuiInputMethod.cpp: In member function
‘lyx::docstring
lyx::frontend::GuiInputMethod::inputMethodQueryFlagsAsString(long unsigned int)
const’:
../../../../src/frontends/qt/GuiInputMethod.cpp:1096:29: error: no match
for ‘operator+=’ (operand types are ‘lyx::docstring’ {aka
‘std::__cxx11::basic_string<unsigned int, std::char_traits<unsigned int>,
std::allocator<unsigned int> >’} and ‘std::wstring’ {aka
‘std::__cxx11::basic_string<wchar_t>’})
1096 | default: str += std::to_wstring(query);
| ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
---
src/frontends/qt/GuiInputMethod.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/frontends/qt/GuiInputMethod.cpp
b/src/frontends/qt/GuiInputMethod.cpp
index de20273b76..9b7e24f556 100644
--- a/src/frontends/qt/GuiInputMethod.cpp
+++ b/src/frontends/qt/GuiInputMethod.cpp
@@ -1093,7 +1093,7 @@ docstring
GuiInputMethod::inputMethodQueryFlagsAsString(unsigned long int query)
case 0x4000: str += "Qt::ImAnchorRectangle"; break;
case 0x8000: str += "Qt::ImInputItemClipRectangle"; break;
case 0x10000: str += "Qt::ImReadOnly"; break;
- default: str += std::to_wstring(query);
+ default: str += from_ascii(std::to_string(query));
}
return str;
}
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs