diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-05-27 11:32:39 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-11 06:52:13 +0200 |
commit | 5c4f470132de1bd0ac33e05309184229b5fcb015 (patch) | |
tree | cb79a4bc90ec689ff5c2ffabe90e3f97f5162131 /src/testlib | |
parent | 4895ae10c6783f039737f2aff9c2ae8006d303eb (diff) |
Port testlib from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: I780945c8923c0a03e9c0a32d039da0c793f650fd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestcase.cpp | 2 | ||||
-rw-r--r-- | 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 35fad9e708..57beed3c7c 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2133,7 +2133,7 @@ QSharedPointer<QTemporaryDir> 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 be50176a08..f831b51a53 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; } |