From 12bcc1a4d6c7ae5edec8a43892a0a2e5f59ad11f Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 5 Apr 2025 09:03:46 -0400 Subject: [PATCH] fix: build issue on Qt 6.9 --- src/lib/gui/KeySequence.cpp | 10 ++++++++-- src/lib/gui/KeySequence.h | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/gui/KeySequence.cpp b/src/lib/gui/KeySequence.cpp index 086c776ac..3f0367757 100644 --- a/src/lib/gui/KeySequence.cpp +++ b/src/lib/gui/KeySequence.cpp @@ -207,8 +207,14 @@ QString KeySequence::keyToString(int key) } // representable in ucs2? - if (key < 0x10000) - return QString("\\u%1").arg(QChar(key).toLower().unicode(), 4, 16, QChar('0')); + if (key < 0x10000) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + const uint16_t keyHex = QChar(key).toLower().unicode(); + return QString("\\u%1").arg(keyHex, kStrSize, kBase, kFillChar); +#else + return QString("\\u%1").arg(QChar(key).toLower().unicode(), kStrSize, kBase, kFillChar); +#endif + } // give up, deskflow probably won't handle this return ""; diff --git a/src/lib/gui/KeySequence.h b/src/lib/gui/KeySequence.h index f6e823bea..10a3dda16 100644 --- a/src/lib/gui/KeySequence.h +++ b/src/lib/gui/KeySequence.h @@ -58,5 +58,9 @@ private: int m_Modifiers; bool m_IsValid; + inline static const int kStrSize = 4; + inline static const int kBase = 16; + inline static const QChar kFillChar = QChar('0'); + static QString keyToString(int key); };