!60 修复英文版中设置->信息->关于中version信息显示错误的问题

From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-01 07:05:08 +00:00 committed by Gitee
commit d148c5ba3f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 3 deletions

View File

@ -0,0 +1,30 @@
From 56af3614f31d303d2664850b8ca9c541cdf0258c Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Tue, 1 Mar 2022 14:33:45 +0800
Subject: [PATCH] modify version-info error
---
plugins/messages-task/about/about.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plugins/messages-task/about/about.cpp b/plugins/messages-task/about/about.cpp
index e675232..e29c227 100644
--- a/plugins/messages-task/about/about.cpp
+++ b/plugins/messages-task/about/about.cpp
@@ -197,6 +197,13 @@ void About::setupVersionCompenent()
version = rx.cap(1);
}
}
+ else if(str.contains("VERSION=")) {
+ QRegExp rx("VERSION=\"(.*)\"$");
+ int pos = rx.indexIn(str);
+ if (pos > -1) {
+ version = rx.cap(1);
+ }
+ }
}
}
--
2.33.0

View File

@ -1,12 +1,12 @@
%define debug_package %{nil}
Name: ukui-control-center
Version: 3.0.4
Release: 1
Release: 2
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-modify-version-info-error.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: gsettings-qt-devel
@ -102,7 +102,7 @@ Suggests: ukui-settings-daemon
%prep
%setup -q
%patch1 -p1
%build
qmake-qt5
make -j24
@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Mar 1 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-2
- modify version-info error
* Wed Jan 26 2022 huayadong <huayadong@kylinos.cn> - 3.0.4-1
- update to upstream version 3.0.4-1