diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-01 01:00:23 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-03 14:13:02 +0100 |
commit | 63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch) | |
tree | fc850de8f31581cc6a64db7a78d1cca479e20ce9 /tests/benchmarks | |
parent | 5ebb03c47604e0597502fbe1069de636987f33fc (diff) | |
parent | fbebc93617d99d2bf8fed559f17dba8bed15a063 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp | 2 | ||||
-rw-r--r-- | tests/benchmarks/gui/text/qtext/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp index bd0889bf4a..1c17f86cf9 100644 --- a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp +++ b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp @@ -110,7 +110,7 @@ void tst_LanceBench::initTestCase() QFile file(scriptsDir + fileName); file.open(QFile::ReadOnly); QByteArray cont = file.readAll(); - scripts.insert(fileName, QString::fromUtf8(cont).split(QLatin1Char('\n'), QString::SkipEmptyParts)); + scripts.insert(fileName, QString::fromUtf8(cont).split(QLatin1Char('\n'), Qt::SkipEmptyParts)); } } diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp index ff92a15017..7cd4931ca2 100644 --- a/tests/benchmarks/gui/text/qtext/main.cpp +++ b/tests/benchmarks/gui/text/qtext/main.cpp @@ -123,7 +123,7 @@ void tst_QText::shaping_data() QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); QVERIFY(data.count() > 1000); - QStringList list = QString::fromUtf8(data.data()).split(QLatin1Char('\n'), QString::SkipEmptyParts); + QStringList list = QString::fromUtf8(data.data()).split(QLatin1Char('\n'), Qt::SkipEmptyParts); QVERIFY(list.count() %2 == 0); // even amount as we have title and then content. for (int i=0; i < list.count(); i+=2) { QTest::newRow(list.at(i).toLatin1()) << list.at(i+1); |