Skip to content

Fix: improve QProcess usage for Qt6 compatibility #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Mar 23, 2026
Merged

Fix: improve QProcess usage for Qt6 compatibility #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions deepin-devicemanager/src/Tool/commontools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,17 @@ void CommonTools::parseEDID(const QStringList &allEDIDS, const QString &input, b
QString edidStr;
if (isHW) {
QProcess process;
process.start(QString("hexdump %1").arg(edid));
process.waitForFinished(-1);
process.start("hexdump", QStringList() << edid);
if (!process.waitForFinished(3000)) {
qCritical() << "Failed to hexdump edid file!";
continue;
}

QString deviceInfo = process.readAllStandardOutput();
if (deviceInfo.isEmpty())
QString deviceInfo = QString::fromLocal8Bit(process.readAllStandardOutput());
if (deviceInfo.isEmpty()) {
qWarning() << "The edid file is empty! " << edid;
continue;
}

QStringList lines = deviceInfo.split("\n");
for (auto line:lines) {
Expand All @@ -218,11 +223,16 @@ void CommonTools::parseEDID(const QStringList &allEDIDS, const QString &input, b
}
} else {
QProcess process;
process.start(QString("hexdump -C %1").arg(edid));
process.waitForFinished(-1);
QString deviceInfo = process.readAllStandardOutput();
if (deviceInfo.isEmpty())
process.start("hexdump", QStringList() << "-C" << edid);
if (!process.waitForFinished(3000)) {
qCritical() << "Failed to hexdump edid file!";
continue;
}
QString deviceInfo = QString::fromLocal8Bit(process.readAllStandardOutput());
if (deviceInfo.isEmpty()) {
qWarning() << "The edid file is empty! " << edid;
continue;
}

QStringList lines = deviceInfo.split("\n");
for (auto line: lines) {
Expand Down
Loading