diff options
| author |  ctrlaltca | 2024-11-19 22:57:45 +0100 |
|---|---|---|
| committer |  GitHub | 2024-11-19 22:57:45 +0100 |
| commit | afed1336ec725cfb86eba4915ae88db7fef80458 (patch) | |
| tree | 9fa8a5b15ec79c56a97c1e85f60f0ee53a4ed223 | |
| parent | Always consider platform supports compositing. Fix #2686 (#2688) (diff) | |
| download | KVIrc-afed1336ec725cfb86eba4915ae88db7fef80458.tar.gz KVIrc-afed1336ec725cfb86eba4915ae88db7fef80458.tar.bz2 KVIrc-afed1336ec725cfb86eba4915ae88db7fef80458.zip | |
KviShortcut: add new ctor to support QKeySequence::StandardKey with more than one QKeySequence (#2689)
| -rw-r--r-- | src/kvilib/core/KviShortcut.cpp | 8 | ||||
| -rw-r--r-- | src/kvilib/core/KviShortcut.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/kvilib/core/KviShortcut.cpp b/src/kvilib/core/KviShortcut.cpp index 5e032f5b3..a12905ffd 100644 --- a/src/kvilib/core/KviShortcut.cpp +++ b/src/kvilib/core/KviShortcut.cpp @@ -46,6 +46,14 @@ QShortcut * KviShortcut::create(const QKeySequence & key, QObject * parent, cons return new QShortcut(key, parent, member, ambiguousMember, context); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +QShortcut * KviShortcut::create(const QKeySequence::StandardKey & key, QObject * parent, const char * member, const char * ambiguousMember, Qt::ShortcutContext context) +{ + //qDebug("New StdKey Shortcut %s\n", key.toString().toUtf8().data()); + return new QShortcut(key, parent, member, ambiguousMember, context); +} +#endif + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QShortcut * KviShortcut::create(Qt::KeyboardModifier mod, Qt::Key key, QWidget * parent, const char * member, const char * ambiguousMember, Qt::ShortcutContext context) #else diff --git a/src/kvilib/core/KviShortcut.h b/src/kvilib/core/KviShortcut.h index 90b0be676..ab5693e5c 100644 --- a/src/kvilib/core/KviShortcut.h +++ b/src/kvilib/core/KviShortcut.h @@ -48,6 +48,7 @@ public: #else static QShortcut * create(const char * key, QObject * parent, const char * member = nullptr, const char * ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); static QShortcut * create(const QKeySequence & key, QObject * parent, const char * member = nullptr, const char * ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); + static QShortcut * create(const QKeySequence::StandardKey & key, QObject * parent, const char * member = nullptr, const char * ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); static QShortcut * create(Qt::KeyboardModifier mod, Qt::Key key, QObject * parent, const char * member = nullptr, const char * ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); #endif }; |