From e6f82a50cf1df3e9cc38c8198d0d3f82502024dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Florea=20B=C4=83nu=C8=99?= Date: Tue, 9 Mar 2021 00:14:31 +0000 Subject: [PATCH] Fix unrar detection on Windows CCBUG: 412413 --- generators/comicbook/unrar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/comicbook/unrar.cpp b/generators/comicbook/unrar.cpp index cdc442a01..823fdec95 100644 --- a/generators/comicbook/unrar.cpp +++ b/generators/comicbook/unrar.cpp @@ -23,6 +23,7 @@ #include "debug_comicbook.h" +#include #include #include @@ -47,7 +48,8 @@ static UnrarFlavour *detectUnrar(const QString &unrarPath, const QString &versio proc.start(unrarPath, QStringList() << versionCommand); bool ok = proc.waitForFinished(-1); Q_UNUSED(ok) - const QStringList lines = QString::fromLocal8Bit(proc.readAllStandardOutput()).split(QLatin1Char('\n'), QString::SkipEmptyParts); + const QRegularExpression regex(QStringLiteral("[\r\n]")); + const QStringList lines = QString::fromLocal8Bit(proc.readAllStandardOutput()).split(regex, QString::SkipEmptyParts); if (!lines.isEmpty()) { if (lines.first().startsWith(QLatin1String("UNRAR "))) kind = new NonFreeUnrarFlavour();