Fixing Qt6 build

qtproject · Jul 10, 2024 · d425a47 · d425a47
1 parent 777e95b
commit d425a47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -703,6 +703,9 @@ class QtServiceAppEventFilter : public QAbstractNativeEventFilter
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
 };
 
+#if QT_VERSION >= 0x060000
+bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
+#else
 bool QtServiceAppEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result)
 {
     MSG *winMessage = (MSG*)message;