Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/tools/qvector.h
		Make QVector(DataPointer dd) public to be able to properly merge
		5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev.
	src/widgets/kernel/qapplication.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index e9aa9aad30..bc964e0d5c 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -191,6 +191,8 @@ private slots:
     void invertPixelsRGB_data();
     void invertPixelsRGB();
 
+    void invertPixelsIndexed();
+
     void exifOrientation_data();
     void exifOrientation();
 
@@ -3086,6 +3088,36 @@ void tst_QImage::invertPixelsRGB()
     QCOMPARE(qBlue(pixel) >> 4, (255 - 96) >> 4);
 }
 
+void tst_QImage::invertPixelsIndexed()
+{
+    {
+        QImage image(1, 1, QImage::Format_Mono);
+        image.fill(Qt::color1);
+        image.invertPixels();
+        QCOMPARE(image.pixelIndex(0, 0), 0);
+    }
+    {
+        QImage image(1, 1, QImage::Format_MonoLSB);
+        image.fill(Qt::color0);
+        image.invertPixels();
+        QCOMPARE(image.pixelIndex(0, 0), 1);
+    }
+    {
+        QImage image(1, 1, QImage::Format_Indexed8);
+        image.setColorTable({0xff000000, 0xffffffff});
+        image.fill(Qt::black);
+        image.invertPixels();
+        QCOMPARE(image.pixelIndex(0, 0), 255);
+    }
+    {
+        QImage image(1, 1, QImage::Format_Indexed8);
+        image.setColorTable({0xff000000, 0xffffffff, 0x80000000, 0x80ffffff, 0x00000000});
+        image.fill(Qt::white);
+        image.invertPixels();
+        QCOMPARE(image.pixelIndex(0, 0), 254);
+    }
+}
+
 void tst_QImage::exifOrientation_data()
 {
     QTest::addColumn<QString>("fileName");