Merge master with some older CI changes

1 files changed, 17 insertions, 0 deletions

diff --git a/src/hardware_functions.cpp b/src/hardware_functions.cpp
index 96c72eb5..2f3c44d3 100644
--- a/src/hardware_functions.cpp
+++ b/src/hardware_functions.cpp
@@ -1,6 +1,9 @@
 #include "hardware_functions.h"
 
 #include <QDebug>
+#include <QtGlobal>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
 
 #if (defined(_WIN32) || defined(_WIN64))
 #include <windows.h>
@@ -49,6 +52,7 @@ QString get_hdid()
 }
 
 #elif defined __APPLE__
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 
@@ -80,3 +84,16 @@ QString get_hdid()
 #error This operating system is unsupported for hardware functions.
 
 #endif
+
+#else
+#include <QSysInfo>
+
+QByteArray machineId;
+
+QString get_hdid()
+{
+  machineId = QSysInfo::machineUniqueId();
+  return QString(machineId);
+}
+
+#endif