From f0bb57f1b3f7a3f6d6bf3c79674d8849194821bc Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 18 Nov 2025 10:26:34 +0800 Subject: [PATCH] support qt 5.11 --- spark-update-tool/src/aptssupdater.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/spark-update-tool/src/aptssupdater.cpp b/spark-update-tool/src/aptssupdater.cpp index a199d32..b84a57d 100644 --- a/spark-update-tool/src/aptssupdater.cpp +++ b/spark-update-tool/src/aptssupdater.cpp @@ -25,7 +25,12 @@ QStringList aptssUpdater::getUpdateablePackages() } QString output = process.readAllStandardOutput(); - QStringList lines = output.split('\n', Qt::SkipEmptyParts); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList lines = output.split('\n', Qt::SkipEmptyParts); +#else + QStringList lines = output.split('\n', QString::SkipEmptyParts); +#endif + // 创建临时文件 QTemporaryFile tempFile; @@ -139,7 +144,15 @@ QStringList aptssUpdater::getDesktopAppNames() dpkgProcess.kill(); continue; } - QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); + + // 修复:添加这行代码来获取进程输出 + QString output = dpkgProcess.readAllStandardOutput(); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList files = output.split('\n', Qt::SkipEmptyParts); +#else + QStringList files = output.split('\n', QString::SkipEmptyParts); +#endif // 先检查常规应用目录 QStringList regularDesktopFiles = files.filter("/usr/share/applications/"); @@ -170,6 +183,8 @@ QStringList aptssUpdater::getDesktopAppNames() } + + bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &appName, const QString &lang, const QString &packageName) { QString lastValidName; @@ -251,7 +266,12 @@ QStringList aptssUpdater::getPackageIcons() packageIcons << QString("%1: %2").arg(packageName, iconPath); continue; } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); +#else + QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts); +#endif + // 查找.desktop文件 QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$"));