Make GlobalShortcut::nativeEventFilter compatible with Qt 6

2020-07-18 04:18:46 +02:00
parent 6154ae7342
commit 5f49567bf7
3 changed files with 13 additions and 0 deletions
--- a/src/globalshortcuts/globalshortcut-x11.cpp
+++ b/src/globalshortcuts/globalshortcut-x11.cpp
@@ -82,7 +82,11 @@ bool GlobalShortcut::unregisterShortcut(quint32 native_key, quint32 native_mods)
  return true;
 }

+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) {
+#else
 bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, long *result) {
+#endif

  Q_UNUSED(eventtype);
  Q_UNUSED(result);