mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
sysutils/synergy: Fix build with Qt 6.9
With hat: kde@ PR: 286051
This commit is contained in:
parent
c8f2c12d93
commit
2d95f2614d
2 changed files with 41 additions and 0 deletions
24
sysutils/synergy/files/patch-src_gui_src_KeySequence.cpp
Normal file
24
sysutils/synergy/files/patch-src_gui_src_KeySequence.cpp
Normal file
|
@ -0,0 +1,24 @@
|
|||
Fix build with Qt >= 6.9.0
|
||||
|
||||
Backported from: https://github.com/symless/synergy/commit/f48514f57297112f8e1757c11b303dcedbb51644
|
||||
|
||||
--- src/gui/src/KeySequence.cpp.orig 2024-08-30 21:23:08 UTC
|
||||
+++ src/gui/src/KeySequence.cpp
|
||||
@@ -207,9 +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, synergy probably won't handle this
|
||||
return "";
|
17
sysutils/synergy/files/patch-src_gui_src_KeySequence.h
Normal file
17
sysutils/synergy/files/patch-src_gui_src_KeySequence.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
Fix build with Qt >= 6.9.0
|
||||
|
||||
Backported from: https://github.com/symless/synergy/commit/f48514f57297112f8e1757c11b303dcedbb51644
|
||||
|
||||
--- src/gui/src/KeySequence.h.orig 2024-08-30 21:23:08 UTC
|
||||
+++ src/gui/src/KeySequence.h
|
||||
@@ -52,6 +52,10 @@ class KeySequence { (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);
|
||||
};
|
||||
|
Loading…
Add table
Reference in a new issue