From 5bb17ce54901ad28a85b50b9df6c87574c63800f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 26 Mar 2023 02:46:52 +0200 Subject: [PATCH 44/44] Qt: Fix C++20 build Do not try to convert from char8_t pointer to char pointer. See osdn #47596 Signed-off-by: Marko Lindqvist --- client/gui-qt/sprite.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/gui-qt/sprite.cpp b/client/gui-qt/sprite.cpp index 89df676a29..36ec24eefc 100644 --- a/client/gui-qt/sprite.cpp +++ b/client/gui-qt/sprite.cpp @@ -214,7 +214,12 @@ struct sprite *qtg_load_gfxnumber(int num) if (num > 20) { ns = QString::number(num); } else { - const char *numsbuf[21] = { +#ifdef __cpp_char8_t + const char8_t +#else + const char +#endif + *numsbuf[21] = { u8"\0xF0\0x9F\0x84\0x8C", u8"\u278A", u8"\u278B", -- 2.39.2