mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-12-14 12:52:04 +08:00
support qt 5.11
This commit is contained in:
@@ -25,7 +25,12 @@ QStringList aptssUpdater::getUpdateablePackages()
|
|||||||
}
|
}
|
||||||
|
|
||||||
QString output = process.readAllStandardOutput();
|
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;
|
QTemporaryFile tempFile;
|
||||||
@@ -139,7 +144,15 @@ QStringList aptssUpdater::getDesktopAppNames()
|
|||||||
dpkgProcess.kill();
|
dpkgProcess.kill();
|
||||||
continue;
|
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/");
|
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)
|
bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &appName, const QString &lang, const QString &packageName)
|
||||||
{
|
{
|
||||||
QString lastValidName;
|
QString lastValidName;
|
||||||
@@ -251,7 +266,12 @@ QStringList aptssUpdater::getPackageIcons()
|
|||||||
packageIcons << QString("%1: %2").arg(packageName, iconPath);
|
packageIcons << QString("%1: %2").arg(packageName, iconPath);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
||||||
QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts);
|
QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts);
|
||||||
|
#else
|
||||||
|
QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// 查找.desktop文件
|
// 查找.desktop文件
|
||||||
QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$"));
|
QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$"));
|
||||||
|
|||||||
Reference in New Issue
Block a user