!26 适配qt低版本的QUuid::WithoutBraces
From: @niko_yhc Reviewed-by: @liubuguiii Signed-off-by: @liubuguiii
This commit is contained in:
commit
98721b0380
@ -0,0 +1,33 @@
|
|||||||
|
From 580281e9fb8001874f99324085fc2437d018b536 Mon Sep 17 00:00:00 2001
|
||||||
|
From: niko_yhc <yinhongchang@kylinsec.com.cn>
|
||||||
|
Date: Thu, 7 Sep 2023 17:11:53 +0800
|
||||||
|
Subject: [PATCH] fix(kiran-authentication-devices):fix QUuid::WithoutBraces
|
||||||
|
for qt low version
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
适配qt低版本的QUuid::WithoutBraces
|
||||||
|
---
|
||||||
|
src/device/auth-device.cpp | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/device/auth-device.cpp b/src/device/auth-device.cpp
|
||||||
|
index a321723..02dd411 100644
|
||||||
|
--- a/src/device/auth-device.cpp
|
||||||
|
+++ b/src/device/auth-device.cpp
|
||||||
|
@@ -40,7 +40,11 @@ bool AuthDevice::init()
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
m_dbusAdaptor = QSharedPointer<AuthDeviceAdaptor>(new AuthDeviceAdaptor(this));
|
||||||
|
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
|
||||||
|
m_deviceID = QUuid::createUuid().toString(QUuid::WithoutBraces);
|
||||||
|
+#else
|
||||||
|
+ m_deviceID = QUuid::createUuid().toString().remove('{').remove('}');
|
||||||
|
+#endif
|
||||||
|
m_deviceStatus = DEVICE_STATUS_IDLE;
|
||||||
|
registerDBusObject();
|
||||||
|
initServiceWatcher();
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: kiran-authentication-devices
|
Name: kiran-authentication-devices
|
||||||
|
|
||||||
Version: 2.5.1
|
Version: 2.5.1
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Kiran Authentication Devices
|
Summary: Kiran Authentication Devices
|
||||||
|
|
||||||
License: MulanPSL-2.0
|
License: MulanPSL-2.0
|
||||||
@ -11,6 +11,8 @@ Patch0001: 0001-fix-mf-iristar-driver-Fix-compilation-issues-with-st.patch
|
|||||||
Patch0002: 0001-fix-ukey-Fix-the-issue-where-only-one-ukey-can-be-bo.patch
|
Patch0002: 0001-fix-ukey-Fix-the-issue-where-only-one-ukey-can-be-bo.patch
|
||||||
Patch0003: 0001-fix-feature-db-Fix-the-issue-of-not-obtaining-featur.patch
|
Patch0003: 0001-fix-feature-db-Fix-the-issue-of-not-obtaining-featur.patch
|
||||||
Patch0004: 0001-fix-ukey-Fix-the-issue-of-duplicate-binding-of-the-s.patch
|
Patch0004: 0001-fix-ukey-Fix-the-issue-of-duplicate-binding-of-the-s.patch
|
||||||
|
Patch0005: 0001-fix-kiran-authentication-devices-fix-QUuid-WithoutBr.patch
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -68,6 +70,9 @@ systemctl enable kiran-authentication-devices.service
|
|||||||
rm -rf ${buildroot}
|
rm -rf ${buildroot}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 7 2023 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.5.1-6
|
||||||
|
- KYOS-F: fix QUuid::WithoutBraces for qt low version
|
||||||
|
|
||||||
* Fri Jun 16 2023 luoqing <luoqing@kylinsec.com.cn> - 2.5.1-5
|
* Fri Jun 16 2023 luoqing <luoqing@kylinsec.com.cn> - 2.5.1-5
|
||||||
- KYOS-F: Fix the issue of duplicate binding of the same UKey device (#I78P3F)
|
- KYOS-F: Fix the issue of duplicate binding of the same UKey device (#I78P3F)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user