diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
tree | f165b7bc319548fb0082365411a871028f92e89e /examples/qtestlib/tutorial5/benchmarking.cpp | |
parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'examples/qtestlib/tutorial5/benchmarking.cpp')
-rw-r--r-- | examples/qtestlib/tutorial5/benchmarking.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp index 4ad984212b..55d25e8a36 100644 --- a/examples/qtestlib/tutorial5/benchmarking.cpp +++ b/examples/qtestlib/tutorial5/benchmarking.cpp @@ -81,7 +81,7 @@ void TestBenchmark::multiple() QFETCH(bool, useLocaleCompare); QString str1 = QLatin1String("This is a test string"); QString str2 = QLatin1String("This is a test string"); - + int result; if (useLocaleCompare) { QBENCHMARK { @@ -101,7 +101,7 @@ void TestBenchmark::series_data() { QTest::addColumn<bool>("useLocaleCompare"); QTest::addColumn<int>("stringSize"); - + for (int i = 1; i < 10000; i += 2000) { QByteArray size = QByteArray::number(i); QTest::newRow(("locale aware compare--" + size).constData()) << true << i; |