Sophie

Sophie

distrib > Mageia > 8 > armv7hl > by-pkgid > 7da4f8935f9379d9c0c434b81d73c05b > files > 2

synergy-1.14.5.14-1.mga8.src.rpm

From 517f7bfa2fda1573b26e4dda4bf6ab90e18c0253 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:06:56 +0300
Subject: [PATCH] Fix build issue for ubuntu16 and ubuntu18 (#7204)

---
 src/gui/src/AppConfig.cpp       | 2 +-
 src/gui/src/LicenseRegistry.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index 338765a754..fd8fc11a75 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -247,7 +247,7 @@ void AppConfig::loadSettings()
     m_LanguageSync              = loadSetting(kLanguageSync, false).toBool();
     m_InvertScrollDirection     = loadSetting(kInvertScrollDirection, false).toBool();
     m_eliteBackersUrl           = loadCommonSetting(kEliteBackersUrl, "https://api2.prod.symless.com/credits/elite-backers").toString();
-    m_guid                      = loadCommonSetting(kGuid, QSysInfo::machineUniqueId()).toString();
+    m_guid                      = loadCommonSetting(kGuid, QUuid::createUuid()).toString();
     m_licenseRegistryUrl        = loadCommonSetting(kLicenseRegistryUrl, "https://api2.prod.symless.com/license/register").toString();
     m_licenseNextCheck          = loadCommonSetting(kLicenseNextCheck, 0).toULongLong();
 
diff --git a/src/gui/src/LicenseRegistry.cpp b/src/gui/src/LicenseRegistry.cpp
index 943275436f..9877d1a40d 100644
--- a/src/gui/src/LicenseRegistry.cpp
+++ b/src/gui/src/LicenseRegistry.cpp
@@ -61,9 +61,13 @@ void LicenseRegistry::registerLicense()
 
 QByteArray LicenseRegistry::getRequestData() const
 {
-    QJsonObject data;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     QString guid(QSysInfo::machineUniqueId());
+#else
+    QString guid;
+#endif
 
+    QJsonObject data;
     if (!guid.isEmpty()) {
         data["guid"] = guid;
         data["guid_type"] = "system";