From d55163b0fa6732d1bcd9c6e282e9b3956d8a579d Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierryb@filewave.com>
Date: Wed, 10 Jul 2024 17:41:33 +0200
Subject: [PATCH] Fixing Qt6 build

---
 qtservice/src/qtservice.cpp     | 2 +-
 qtservice/src/qtservice.h       | 4 ++++
 qtservice/src/qtservice_win.cpp | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/qtservice/src/qtservice.cpp b/qtservice/src/qtservice.cpp
index e3b3794..804095a 100644
--- a/qtservice/src/qtservice.cpp
+++ b/qtservice/src/qtservice.cpp
@@ -626,7 +626,7 @@ QtServiceBase::QtServiceBase(int argc, char **argv, const QString &name)
     d_ptr = new QtServiceBasePrivate(nm);
     d_ptr->q_ptr = this;
 
-    d_ptr->serviceFlags = 0;
+    d_ptr->serviceFlags = {};
     d_ptr->sysd = 0;
     for (int i = 0; i < argc; ++i)
         d_ptr->args.append(QString::fromLocal8Bit(argv[i]));
diff --git a/qtservice/src/qtservice.h b/qtservice/src/qtservice.h
index bab1fea..9fcc15c 100644
--- a/qtservice/src/qtservice.h
+++ b/qtservice/src/qtservice.h
@@ -22,7 +22,11 @@
 #  define QT_QTSERVICE_EXPORT
 #endif
 
+#if QT_VERSION >= 0x060000
+#include <QtCore/qcontainerfwd.h>
+#else
 class QStringList;
+#endif
 class QtServiceControllerPrivate;
 
 class QT_QTSERVICE_EXPORT QtServiceController
diff --git a/qtservice/src/qtservice_win.cpp b/qtservice/src/qtservice_win.cpp
index d0441f4..0b2c8e7 100644
--- a/qtservice/src/qtservice_win.cpp
+++ b/qtservice/src/qtservice_win.cpp
@@ -700,10 +700,18 @@ class QtServiceAppEventFilter : public QAbstractNativeEventFilter
 {
 public:
     QtServiceAppEventFilter() {}
+#if QT_VERSION >= 0x060000
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result);
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+#endif
 };
 
+#if QT_VERSION >= 0x060000
+bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
+#else
 bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result)
+#endif
 {
     MSG *winMessage = (MSG*)message;
     if (winMessage->message == WM_ENDSESSION && (winMessage->lParam & ENDSESSION_LOGOFF)) {