diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/benchmarks/gui/painting | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/benchmarks/gui/painting')
4 files changed, 10 insertions, 8 deletions
diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 9f5fdf44ca..8d3d7c9549 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,10 +1,10 @@ load(qttest_p4) +QT += widgets +QT += gui-private widgets-private # do not run benchmarks by default in 'make check' CONFIG -= testcase -QT += gui-private - TEMPLATE = app TARGET = tst_bench_qpainter diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index 27e307b8bc..37a8329151 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -45,6 +45,7 @@ #include <QDialog> #include <QImage> #include <QPaintEngine> +#include <QTileRules> #include <math.h> #ifndef M_PI #define M_PI 3.14159265358979323846 @@ -129,8 +130,8 @@ struct PrimitiveSet { QPixmap rasterPixmap(int width, int height) { - QPixmapData *data = - new QRasterPixmapData(QPixmapData::PixmapType); + QPlatformPixmap *data = + new QRasterPlatformPixmap(QPlatformPixmap::PixmapType); data->resize(width, height); @@ -144,8 +145,8 @@ QPixmap rasterPixmap(const QSize &size) QPixmap rasterPixmap(const QImage &image) { - QPixmapData *data = - new QRasterPixmapData(QPixmapData::PixmapType); + QPlatformPixmap *data = + new QRasterPlatformPixmap(QPlatformPixmap::PixmapType); data->fromImage(image, Qt::AutoColor); diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 21ed8e0121..8c76c587b0 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets # do not run benchmarks by default in 'make check' CONFIG -= testcase diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 6d2c783746..64c1c58293 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,10 +1,10 @@ load(qttest_p4) +QT += widgets +QT += core-private gui-private widgets-private # do not run benchmarks by default in 'make check' CONFIG -= testcase -QT += core-private gui-private - TEMPLATE = app TARGET = tst_qtracebench |