From 5c4f470132de1bd0ac33e05309184229b5fcb015 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 27 May 2020 11:32:39 +0200 Subject: [PATCH] Port testlib from QStringRef to QStringView Task-number: QTBUG-84319 Change-Id: I780945c8923c0a03e9c0a32d039da0c793f650fd Reviewed-by: Thiago Macieira --- src/testlib/qtestcase.cpp | 2 +- src/testlib/qtestlog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 35fad9e7086..57beed3c7cd 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2133,7 +2133,7 @@ QSharedPointer QTest::qExtractTestData(const QString &dirName) QFileInfo fileInfo = it.fileInfo(); if (!fileInfo.isDir()) { - const QString destination = dataPath + QLatin1Char('/') + fileInfo.filePath().midRef(resourcePath.length()); + const QString destination = dataPath + QLatin1Char('/') + QStringView{fileInfo.filePath()}.mid(resourcePath.length()); QFileInfo destinationFileInfo(destination); QDir().mkpath(destinationFileInfo.path()); if (!QFile::copy(fileInfo.filePath(), destination)) { diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index be50176a083..f831b51a532 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -144,7 +144,7 @@ namespace QTest { // (the space was added automatically by ~QDebug() until Qt 5.3, // so autotests still might expect it) if (expected.endsWith(QLatin1Char(' '))) - return actual == expected.leftRef(expected.length() - 1); + return actual == QStringView{expected}.left(expected.length() - 1); return false; }