!23 fix redeclaration of 'QStringList usergroupList'
From: @tanyulong2021 Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
cb95656cf3
@ -0,0 +1,25 @@
|
||||
From 56214c5b07f2917c6128b3d923d80af49f1b05c3 Mon Sep 17 00:00:00 2001
|
||||
From: tanyulong <tanyulong@kylinos.cn>
|
||||
Date: Fri, 9 Jul 2021 17:44:31 +0800
|
||||
Subject: [PATCH] fix redeclaration of 'QStringList usergroupList in
|
||||
editgroupdialog.cpp
|
||||
|
||||
---
|
||||
plugins/account/userinfo/editgroupdialog.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/account/userinfo/editgroupdialog.cpp b/plugins/account/userinfo/editgroupdialog.cpp
|
||||
index d3971cd..4cc3bc6 100755
|
||||
--- a/plugins/account/userinfo/editgroupdialog.cpp
|
||||
+++ b/plugins/account/userinfo/editgroupdialog.cpp
|
||||
@@ -134,7 +134,6 @@ void EditGroupDialog::getUsersList(QString usergroup)
|
||||
|
||||
}
|
||||
QStringList usersList = allUsers;
|
||||
- QStringList usergroupList = usergroup.split(",");
|
||||
|
||||
for(int i = 0; i < usersList.size(); i++){
|
||||
QListWidgetItem * item = new QListWidgetItem(ui->listWidget);
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-control-center
|
||||
Version: 3.0.1
|
||||
Release: 7
|
||||
Release: 8
|
||||
Summary: utilities to configure the UKUI desktop
|
||||
License: GPL-2+
|
||||
URL: http://www.ukui.org
|
||||
@ -77,7 +77,7 @@ patch4: 0005-fix-blueman-tray-and-groupadd-autologin.patch
|
||||
patch5: 0001-add-judgment-when-Bluetooth-does-not-exist.patch
|
||||
patch6: 0006-fix-Group-members-are-not-displayed.patch
|
||||
patch7: 0007-fix-vnc-crashed.patch
|
||||
|
||||
patch8: 0008-fix-redeclaration-of-QStringList-usergroupList-in-ed.patch
|
||||
Recommends: qt5-qtquickcontrols
|
||||
|
||||
Suggests: gsettings-desktop-schemas
|
||||
@ -105,6 +105,7 @@ Suggests: ukui-settings-daemon
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
qmake-qt5
|
||||
@ -148,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
|
||||
|
||||
%changelog
|
||||
* Fri Jul 09 2021 tanyulong<tanyulong@kylinos.cn> - 3.0.1-8
|
||||
- fix redeclaration of QStringList usergroupList
|
||||
|
||||
* Fri Jul 09 2021 tanyulong<tanyulong@kylinos.cn> - 3.0.1-7
|
||||
- fix vnc crashed
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user