diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:32:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:45:05 +0100 |
| commit | 96232be1466e8c059c270b611ce7c32997ff60a9 (patch) | |
| tree | 9bf47c0c2c84556415eee7f938a098ae7e542649 /tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp | |
| parent | 8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1 (diff) | |
| parent | fb8c95bac09910c4dfa476ab97c6206b2e94ee53 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp
Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
Diffstat (limited to 'tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp')
| -rw-r--r-- | tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp index fcddf5ed90..45acd41749 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp @@ -153,9 +153,9 @@ void tst_qstylesheetstyle::grid_data() QTest::addColumn<int>("N"); for (int n = 5; n <= 25; n += 5) { const QByteArray nString = QByteArray::number(n*n); - QTest::newRow(("simple--" + nString).constData()) << false << false << n; - QTest::newRow(("events--" + nString).constData()) << true << false << n; - QTest::newRow(("show--" + nString).constData()) << true << true << n; + QTest::newRow(QByteArray("simple--" + nString).constData()) << false << false << n; + QTest::newRow(QByteArray("events--" + nString).constData()) << true << false << n; + QTest::newRow(QByteArray("show--" + nString).constData()) << true << true << n; } } |