diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp')
| -rw-r--r-- | tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp index d8082cc2e0..a61610786f 100644 --- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp +++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp @@ -213,7 +213,6 @@ void tst_QtBench::qtBench_data() benchmarks << (new DrawText(longString, DrawText::PixmapMode)); benchmarks << (new DrawText(superLongString, DrawText::PixmapMode)); -#if QT_VERSION >= 0x040700 benchmarks << (new DrawText(shortString, DrawText::StaticTextMode)); benchmarks << (new DrawText(middleString, DrawText::StaticTextMode)); benchmarks << (new DrawText(longString, DrawText::StaticTextMode)); @@ -228,7 +227,6 @@ void tst_QtBench::qtBench_data() benchmarks << (new DrawText(middleString, DrawText::StaticTextBackendOptimizations)); benchmarks << (new DrawText(longString, DrawText::StaticTextBackendOptimizations)); benchmarks << (new DrawText(superLongString, DrawText::StaticTextBackendOptimizations)); -#endif foreach (Benchmark *benchmark, benchmarks) QTest::newRow(qPrintable(benchmark->name())) << reinterpret_cast<void *>(benchmark); |