modify lupdate-qt5 run error

(cherry picked from commit 657e1a4fd10686d5a08fad2d819343319f1a5f0f)

0001-modify-lupdate-qt5-run-error.patch

@@ -1,26 +1,37 @@
-From bf31934b1916c6b8511e6daecec2a3d2748983ea Mon Sep 17 00:00:00 2001
+From 1feda57a8a7a7dc2a459d9b3e77fcee76928891c Mon Sep 17 00:00:00 2001
 From: pei-jiankang <peijiankang@kylinos.cn>
-Date: Tue, 22 Feb 2022 13:11:24 +0800
+Date: Fri, 11 Mar 2022 15:32:43 +0800
 Subject: [PATCH] modify lupdate-qt5 run error
 
 ---
- src/linguist/lupdate/main.cpp | 3 ++-
+ src/linguist/lupdate-pro/main.cpp | 14 ++++++++++++++
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 14 insertions(+)
 
-diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
+diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
-index 104971e..8252354 100644
+index 1ce039c..1a62939 100644
---- a/src/linguist/lupdate/main.cpp
+--- a/src/linguist/lupdate-pro/main.cpp
-+++ b/src/linguist/lupdate/main.cpp
++++ b/src/linguist/lupdate-pro/main.cpp
-@@ -963,7 +963,8 @@ int main(int argc, char **argv)
+@@ -139,6 +139,20 @@ int main(int argc, char **argv)
- 
+         } else if (isProOrPriFile(arg)) {
-     QString errorString;
+             lprodumpOptions << arg;
-     if (!proFiles.isEmpty()) {
+             hasProFiles = true;
--        runQtTool(QStringLiteral("lupdate-pro"), app.arguments().mid(1));
++	}else if (arg.startsWith(QLatin1String("@"))) {
-+        proFiles += app.arguments().mid(2);
++            QFile lstFile(arg.mid(1));
-+	runQtTool(QStringLiteral("lupdate-pro"), proFiles);
++            if (!lstFile.open(QIODevice::ReadOnly)) {
-         return 0;
++                printErr(LU::tr("lupdate-pro error: List file '%1' is not readable.\n")
-     }
++                         .arg(lstFile.fileName()));
- 
++                return 1;
++            }
++            while (!lstFile.atEnd()) {
++                QString lineContent = QString::fromLocal8Bit(lstFile.readLine().trimmed());
++                if (isProOrPriFile(lineContent)) {
++                    lprodumpOptions << lineContent;
++                    hasProFiles = true;
++                }
++            }
+         } else {
+             lupdateOptions << arg;
+         }
 -- 
 2.33.0
 

qt5-qttools.spec

@@ -1,6 +1,6 @@
 Name:          qt5-qttools
 Version:       5.15.2
-Release:       2
+Release:       3
 Summary:       Qt5 QtTool module
 License:       LGPLv3 or LGPLv2
 Url:           http://www.qt.io
@@ -260,10 +260,13 @@ cd -
 
 
 %changelog
-* Tue Feb 22 2022 peijiankang <peijiankang@kylinos.cn> - 5.15.2-2
+* Fri Mar 11 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.15.2-3
 - modify lupdate-qt5 run error
 
-* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+* Tue Feb 22 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.15.2-2
+- modify lupdate-qt5 run error
+
+* Wed Oct 13 2021 pei-jiankang <peijiankang@kylinos.cn> - 5.15.2-1
 - update to upstream version 5.15.2
 
 * Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-5