diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 21:59:27 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 22:00:35 +0200 |
commit | 4f158ccee56827af2a0d7b0a043c5e6cdc3bad5b (patch) | |
tree | 068d0e99a0100f64364f6490d5c1e39c34ffc2aa /tests/benchmarks | |
parent | 5c63e6fd7541609c3fadb694c071b42e93b7acf5 (diff) | |
parent | 9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9f802cb9b4d9ccba77ca39428a5cb1afd2d01642
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index 71a2742ac5..ca41d7f570 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -127,7 +127,7 @@ QPixmap rasterPixmap(const QImage &image) QPlatformPixmap *data = new QRasterPlatformPixmap(QPlatformPixmap::PixmapType); - data->fromImage(image, Qt::AutoColor); + data->fromImage(image, Qt::AutoColor | Qt::NoFormatConversion); return QPixmap(data); } @@ -613,9 +613,7 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QTest::addColumn<int>("type"); // 0 = circle, 1 = diag line, 2 = solid rect, 3 = alpharect QList<QSize> sizes; - sizes << QSize(1, 1) - << QSize(10, 10) - << QSize(100, 100) + sizes << QSize(10, 10) << QSize(1000, 1000); const char *typeNames[] = { @@ -657,7 +655,6 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QImage::Format_RGB32, QImage::Format_ARGB32_Premultiplied, QImage::Format_RGB16, - QImage::Format_ARGB8565_Premultiplied, QImage::Format_BGR30, QImage::Format_Invalid }; @@ -682,12 +679,9 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QImage::Format_ARGB32, QImage::Format_ARGB32_Premultiplied, QImage::Format_RGB16, - QImage::Format_ARGB8565_Premultiplied, QImage::Format_RGB888, QImage::Format_RGBX8888, QImage::Format_RGBA8888, - QImage::Format_RGBA8888_Premultiplied, - QImage::Format_A2BGR30_Premultiplied, QImage::Format_RGB30, QImage::Format_Grayscale8, QImage::Format_Invalid |