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

Conflicts:
	examples/corelib/ipc/ipc.pro
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp

Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf

10 files changed, 32 insertions, 3 deletions

diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro
index d32e84c0d7..36d64a275f 100644
--- a/tests/auto/gui/image/qimage/qimage.pro
+++ b/tests/auto/gui/image/qimage/qimage.pro
@@ -5,6 +5,6 @@ SOURCES  += tst_qimage.cpp
 QT += core-private gui-private testlib
 contains(QT_CONFIG, c++11): CONFIG += c++11
 
-android:!android-no-sdk:RESOURCES+=qimage.qrc
+android: RESOURCES+=qimage.qrc
 
 TESTDATA += images/*
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index dd10ba2e82..cc75846fdd 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -193,6 +193,7 @@ private slots:
     void metadataPassthrough();
 
     void pixelColor();
+    void pixel();
 
 private:
     const QString m_prefix;
@@ -3077,5 +3078,33 @@ void tst_QImage::pixelColor()
     QCOMPARE(t.pixel(0,0), argb32pm.pixel(0,0));
 }
 
+void tst_QImage::pixel()
+{
+    {
+        QImage mono(1, 1, QImage::Format_Mono);
+        QImage monolsb(1, 1, QImage::Format_MonoLSB);
+        QImage indexed(1, 1, QImage::Format_Indexed8);
+
+        mono.fill(0);
+        monolsb.fill(0);
+        indexed.fill(0);
+
+        QCOMPARE(QColor(mono.pixel(0, 0)), QColor(Qt::black));
+        QCOMPARE(QColor(monolsb.pixel(0, 0)), QColor(Qt::black));
+        indexed.pixel(0, 0); // Don't crash
+    }
+
+    {
+        uchar a = 0;
+        QImage mono(&a, 1, 1, QImage::Format_Mono);
+        QImage monolsb(&a, 1, 1, QImage::Format_MonoLSB);
+        QImage indexed(&a, 1, 1, QImage::Format_Indexed8);
+
+        QCOMPARE(QColor(mono.pixel(0, 0)), QColor(Qt::black));
+        QCOMPARE(QColor(monolsb.pixel(0, 0)), QColor(Qt::black));
+        indexed.pixel(0, 0); // Don't crash
+    }
+}
+
 QTEST_GUILESS_MAIN(tst_QImage)
 #include "tst_qimage.moc"
diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index 2ab06abe83..3d35bf59da 100644
--- a/tests/auto/gui/image/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
@@ -5,7 +5,7 @@ MOC_DIR=tmp
 QT += core-private gui-private network testlib
 RESOURCES += qimagereader.qrc
 
-android: !android-no-sdk {
+android {
     RESOURCES += android_testdata.qrc
 }
 
diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
index 31184bffdb..34adedd187 100644
--- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro
+++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
@@ -3,5 +3,5 @@ TARGET = tst_qimagewriter
 QT += testlib
 SOURCES += tst_qimagewriter.cpp
 MOC_DIR=tmp
-android:!android-no-sdk:RESOURCES+= qimagewriter.qrc
+android: RESOURCES+= qimagewriter.qrc
 TESTDATA += images/*
diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
index e9a995e19e..03b1a65f70 100644
--- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
index 41ef57f94d..0ef47c556d 100644
--- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
index 35d60d138b..2060854802 100644
--- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png
index 55d8247cfc..a35316b9c9 100644
--- a/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png
diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png
index 28cd2f06d1..3dd2115df1 100644
--- a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png
diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png
index 09735a9752..99cbf4f13a 100644
--- a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png