diff options
Diffstat (limited to 'tests/baselineserver/src')
| -rw-r--r-- | tests/baselineserver/src/baselineserver.cpp | 3 | ||||
| -rw-r--r-- | tests/baselineserver/src/report.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/baselineserver/src/baselineserver.cpp b/tests/baselineserver/src/baselineserver.cpp index 0525e1e670..c6e12dc09c 100644 --- a/tests/baselineserver/src/baselineserver.cpp +++ b/tests/baselineserver/src/baselineserver.cpp @@ -40,6 +40,7 @@ #include <QProcess> #include <QDirIterator> #include <QUrl> +#include <QRegularExpression> // extra fields, for use in image metadata storage const QString PI_ImageChecksum(QLS("ImageChecksum")); @@ -532,7 +533,7 @@ PlatformInfo BaselineHandler::mapPlatformInfo(const PlatformInfo& orig) const host = orig.value(PI_HostAddress); } else { if (!orig.isAdHocRun()) { // i.e. CI system run, so remove index postfix typical of vm hostnames - host.remove(QRegExp(QLS("\\d+$"))); + host.remove(QRegularExpression(QLS("\\d+$"))); if (host.endsWith(QLC('-'))) host.chop(1); } diff --git a/tests/baselineserver/src/report.cpp b/tests/baselineserver/src/report.cpp index 5a55fe5b37..748d76ebfe 100644 --- a/tests/baselineserver/src/report.cpp +++ b/tests/baselineserver/src/report.cpp @@ -32,6 +32,7 @@ #include <QProcess> #include <QUrl> #include <QXmlStreamWriter> +#include <QRegularExpression> #include <unistd.h> Report::Report() @@ -67,7 +68,7 @@ void Report::init(const BaselineHandler *h, const QString &r, const PlatformInfo plat = p; settings = s; rootDir = BaselineServer::storagePath() + QLC('/'); - baseDir = handler->pathForItem(ImageItem(), true, false).remove(QRegExp("/baselines/.*$")); + baseDir = handler->pathForItem(ImageItem(), true, false).remove(QRegularExpression("/baselines/.*$")); QString dir = baseDir + (plat.isAdHocRun() ? QLS("/adhoc-reports") : QLS("/auto-reports")); QDir cwd; if (!cwd.exists(rootDir + dir)) |