From 5dceeffc2582b7333f202dcc5358bfd1710e2918 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Sat, 18 Sep 2021 22:15:39 +0800 Subject: [PATCH] improve the version check --- .vscode/settings.json | 10 ++++++++++ GPService/gpservice.cpp | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..90b8e93 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "files.associations": { + "qregularexpression": "cpp", + "qfileinfo": "cpp", + "qregularexpressionmatch": "cpp", + "qdatetime": "cpp", + "qprocess": "cpp", + "qobject": "cpp" + } +} \ No newline at end of file diff --git a/GPService/gpservice.cpp b/GPService/gpservice.cpp index aafc22f..d6cc656 100644 --- a/GPService/gpservice.cpp +++ b/GPService/gpservice.cpp @@ -127,9 +127,9 @@ bool GPService::isValidVersion(QString &bin) { QProcess p; p.start(bin, QStringList("--version")); p.waitForFinished(); - QString output = p.readAllStandardOutput(); + QString output = p.readAll(); - QRegularExpression re("v(\\d+).*?\\n"); + QRegularExpression re("v(\\d+).*?(\\s|\\n)"); QRegularExpressionMatch match = re.match(output); if (match.hasMatch()) {