Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 12 insertions, 2 deletions

diff --git a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
index e0f69bee11..570c7b59fa 100644
--- a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
+++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
@@ -200,6 +200,8 @@ void tst_QImageConversion::convertRgb32_data()
     QTest::newRow("argb32 -> argb8565pm") << argb32 << QImage::Format_ARGB8565_Premultiplied;
     QTest::newRow("argb32 -> argb4444pm") << argb32 << QImage::Format_ARGB4444_Premultiplied;
     QTest::newRow("argb32 -> argb6666pm") << argb32 << QImage::Format_ARGB6666_Premultiplied;
+    QTest::newRow("argb32 -> rgba64") << argb32 << QImage::Format_RGBA64;
+    QTest::newRow("argb32 -> rgba64pm") << argb32 << QImage::Format_RGBA64_Premultiplied;
 
     QTest::newRow("argb32pm -> rgb16") << argb32pm << QImage::Format_RGB16;
     QTest::newRow("argb32pm -> rgb32") << argb32pm << QImage::Format_RGB32;
@@ -239,6 +241,7 @@ void tst_QImageConversion::convertGeneric_data()
     QImage a2rgb30 = argb32.convertToFormat(QImage::Format_A2RGB30_Premultiplied);
     QImage rgb666 = rgb32.convertToFormat(QImage::Format_RGB666);
     QImage argb4444 = argb32.convertToFormat(QImage::Format_ARGB4444_Premultiplied);
+    QImage rgba64pm = argb32.convertToFormat(QImage::Format_RGBA64_Premultiplied);
 
     QTest::newRow("indexed8 -> rgb32") << i8 << QImage::Format_RGB32;
     QTest::newRow("indexed8 -> argb32") << i8 << QImage::Format_ARGB32;
@@ -289,6 +292,13 @@ void tst_QImageConversion::convertGeneric_data()
     QTest::newRow("argb4444pm -> rgba8888pm") << argb4444 << QImage::Format_RGBA8888_Premultiplied;
     QTest::newRow("argb4444pm -> rgb30") << argb4444 << QImage::Format_RGB30;
     QTest::newRow("argb4444pm -> a2bgr30") << argb4444 << QImage::Format_A2BGR30_Premultiplied;
+
+    QTest::newRow("rgba64pm -> argb32") << rgba64pm << QImage::Format_ARGB32;
+    QTest::newRow("rgba64pm -> rgbx8888") << rgba64pm << QImage::Format_RGBX8888;
+    QTest::newRow("rgba64pm -> rgba8888pm") << rgba64pm << QImage::Format_RGBA8888_Premultiplied;
+    QTest::newRow("rgba64pm -> rgb30") << rgba64pm << QImage::Format_RGB30;
+    QTest::newRow("rgba64pm -> a2bgr30") << rgba64pm << QImage::Format_A2BGR30_Premultiplied;
+    QTest::newRow("rgba64pm -> rgba64") << rgba64pm << QImage::Format_RGBA64;
 }
 
 void tst_QImageConversion::convertGeneric()
@@ -347,10 +357,10 @@ void tst_QImageConversion::convertGenericInplace()
     QFETCH(QImage::Format, outputFormat);
 
     QImage::Format inputFormat = inputImage.format();
-    QImage tmpImage = qMove(inputImage);
+    QImage tmpImage = std::move(inputImage);
 
     QBENCHMARK {
-        tmpImage = (qMove(tmpImage).convertToFormat(outputFormat)).convertToFormat(inputFormat);
+        tmpImage = (std::move(tmpImage).convertToFormat(outputFormat)).convertToFormat(inputFormat);
     }
 }