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

Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af

4 files changed, 48 insertions, 9 deletions

diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg
new file mode 100644
index 0000000000..0aa164b78b
--- /dev/null
+++ b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg
diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro
index 117e34653d..42280d3bd4 100644
--- a/tests/auto/gui/image/qimage/qimage.pro
+++ b/tests/auto/gui/image/qimage/qimage.pro
@@ -6,4 +6,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
+
 TESTDATA += images/*
diff --git a/tests/auto/gui/image/qimage/qimage.qrc b/tests/auto/gui/image/qimage/qimage.qrc
new file mode 100644
index 0000000000..e5de27faf8
--- /dev/null
+++ b/tests/auto/gui/image/qimage/qimage.qrc
@@ -0,0 +1,22 @@
+<RCC>
+  <qresource prefix="/">
+    <file>images/image.bmp</file>
+    <file>images/image.gif</file>
+    <file>images/image.ico</file>
+    <file>images/image.jpg</file>
+    <file>images/image.pbm</file>
+    <file>images/image.pgm</file>
+    <file>images/image.png</file>
+    <file>images/image.ppm</file>
+    <file>images/image.xbm</file>
+    <file>images/image.xpm</file>
+    <file>images/jpeg_exif_orientation_value_1.jpg</file>
+    <file>images/jpeg_exif_orientation_value_2.jpg</file>
+    <file>images/jpeg_exif_orientation_value_3.jpg</file>
+    <file>images/jpeg_exif_orientation_value_4.jpg</file>
+    <file>images/jpeg_exif_orientation_value_5.jpg</file>
+    <file>images/jpeg_exif_orientation_value_6.jpg</file>
+    <file>images/jpeg_exif_orientation_value_7.jpg</file>
+    <file>images/jpeg_exif_orientation_value_8.jpg</file>
+  </qresource>
+</RCC>
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 676f8084a1..c61f5f38ca 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -173,6 +173,7 @@ private slots:
     void invertPixelsRGB_data();
     void invertPixelsRGB();
 
+    void exifOrientation_data();
     void exifOrientation();
 
     void cleanupFunctions();
@@ -2641,20 +2642,34 @@ void tst_QImage::invertPixelsRGB()
     QCOMPARE(qBlue(pixel) >> 4, (255 - 96) >> 4);
 }
 
+void tst_QImage::exifOrientation_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::newRow("Orientation 1, Intel format") << m_prefix + "jpeg_exif_orientation_value_1.jpg";
+    QTest::newRow("Orientation 2, Intel format") << m_prefix + "jpeg_exif_orientation_value_2.jpg";
+    QTest::newRow("Orientation 3, Intel format") << m_prefix + "jpeg_exif_orientation_value_3.jpg";
+    QTest::newRow("Orientation 4, Intel format") << m_prefix + "jpeg_exif_orientation_value_4.jpg";
+    QTest::newRow("Orientation 5, Intel format") << m_prefix + "jpeg_exif_orientation_value_5.jpg";
+    QTest::newRow("Orientation 6, Intel format") << m_prefix + "jpeg_exif_orientation_value_6.jpg";
+    QTest::newRow("Orientation 6, Motorola format") << m_prefix + "jpeg_exif_orientation_value_6_motorola.jpg";
+    QTest::newRow("Orientation 7, Intel format") << m_prefix + "jpeg_exif_orientation_value_7.jpg";
+    QTest::newRow("Orientation 8, Intel format") << m_prefix + "jpeg_exif_orientation_value_8.jpg";
+}
+
 void tst_QImage::exifOrientation()
 {
-    for (unsigned int i = 1; i <= 8; ++i) {
-        QImage img;
-        QRgb px;
+    QFETCH(QString, fileName);
 
-        QVERIFY(img.load(m_prefix + QString::fromLatin1("jpeg_exif_orientation_value_%1.jpg").arg(i)));
+    QImage img;
+    QRgb px;
 
-        px = img.pixel(0, 0);
-        QVERIFY(qRed(px) > 250 && qGreen(px) < 5 && qBlue(px) < 5);
+    QVERIFY(img.load(fileName));
 
-        px = img.pixel(img.width() - 1, 0);
-        QVERIFY(qRed(px) < 5 && qGreen(px) < 5 && qBlue(px) > 250);
-    }
+    px = img.pixel(0, 0);
+    QVERIFY(qRed(px) > 250 && qGreen(px) < 5 && qBlue(px) < 5);
+
+    px = img.pixel(img.width() - 1, 0);
+    QVERIFY(qRed(px) < 5 && qGreen(px) < 5 && qBlue(px) > 250);
 }
 
 static void cleanupFunction(void* info)