From f23694958d94fb3a13660918628b81a9bdcced55 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Mon, 1 Apr 2024 00:15:47 +0200
Subject: [PATCH] Fix Qt5 build

---
 Makefile                                              | 8 ++++----
 app/SysTray-X/SysTray-X-app/SysTray-X-app.pro         | 3 +--
 app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp | 6 +++++-
 app/SysTray-X/SysTray-X-app/shortcut.cpp              | 6 +++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index df98b78..e30c677 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ else
 ifeq (GNU/Linux,$(shell uname -o))
  SYSTEM = Linux
  
- QMAKE = qmake6
- ifeq (, $(shell which qmake6 2>/dev/null))
-   QMAKE = qmake-qt5
-   ifeq (, $(shell which qmake-qt5 2>/dev/null))
+  QMAKE = qmake-qt5
+  ifeq (, $(shell which qmake-qt5 2>/dev/null))
+   QMAKE = qmake6
+   ifeq (, $(shell which qmake6 2>/dev/null))
     ifeq (, $(shell which qmake 2>/dev/null))
       $(error "No qmake in $(PATH)")
     endif
diff --git a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
index a6988ef..42d2535 100644
--- a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
+++ b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
@@ -25,8 +25,7 @@ unix:!macx: {
         lessThan(QT_MAJOR_VERSION, 6): {
             QT += dbus KNotifications
         }
-        else
-        {
+        greaterThan(QT_MAJOR_VERSION, 5): {
             INCLUDEPATH += /usr/include/KF6/KStatusNotifierItem
             LIBS += -lKF6StatusNotifierItem
         }
diff --git a/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp b/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
index 16c2526..95383be 100644
--- a/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
+++ b/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
@@ -55,9 +55,13 @@ bool NativeEventFilterX11::nativeEventFilter( const QByteArray& eventType, void*
  */
 bool NativeEventFilterX11::connectShortcut( QKeySequence key_seq )
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    Qt::Key key_code = Qt::Key( key_seq[ 0 ] & static_cast< int >( ~Qt::KeyboardModifierMask ) );
+    Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ] & static_cast<int>( Qt::KeyboardModifierMask ) );
+#else
     Qt::Key key_code = Qt::Key( key_seq[ 0 ].toCombined() & static_cast< int >( ~Qt::KeyboardModifierMask ) );
     Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ].toCombined() & static_cast<int>( Qt::KeyboardModifierMask ) );
-
+#endif
     return connectShortcut( key_code, key_modifiers );
 }
 
diff --git a/app/SysTray-X/SysTray-X-app/shortcut.cpp b/app/SysTray-X/SysTray-X-app/shortcut.cpp
index d1e8249..8d90da5 100644
--- a/app/SysTray-X/SysTray-X-app/shortcut.cpp
+++ b/app/SysTray-X/SysTray-X-app/shortcut.cpp
@@ -49,9 +49,13 @@ Shortcut::~Shortcut()
  */
 bool Shortcut::setShortcut( QKeySequence key_seq )
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    Qt::Key key_code = Qt::Key( key_seq[ 0 ] & ~Qt::KeyboardModifierMask );
+    Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ] & Qt::KeyboardModifierMask);
+#else
     Qt::Key key_code = Qt::Key( key_seq[ 0 ].toCombined() & ~Qt::KeyboardModifierMask );
     Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ].toCombined() & Qt::KeyboardModifierMask);
-
+#endif
     return setShortcut( key_code, key_modifiers );
 }