Merge remote-tracking branch 'origin/5.4' into merge5.5

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/io/qnoncontiguousbytedevice_p.h
	src/gui/image/qjpeghandler.cpp
	src/network/access/qhttpthreaddelegate_p.h
	tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
	tests/auto/widgets/widgets/qmenubar/BLACKLIST

Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3

10 files changed, 0 insertions, 33 deletions

diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg
deleted file mode 100644
index aaa4ac4e10..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg
deleted file mode 100644
index a61d2723d7..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg
deleted file mode 100644
index 43e56dcef7..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg
deleted file mode 100644
index d5d06f7409..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg
deleted file mode 100644
index 1886f3775e..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg
deleted file mode 100644
index 5cec757354..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg
+++ /dev/null
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
deleted file mode 100644
index 0aa164b78b..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg
deleted file mode 100644
index b3dcc466a9..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg
deleted file mode 100644
index 8bc390e2b9..0000000000
--- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg
+++ /dev/null
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 2931185c8b..62a9f19f36 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -181,9 +181,6 @@ private slots:
     void invertPixelsRGB_data();
     void invertPixelsRGB();
 
-    void exifOrientation_data();
-    void exifOrientation();
-
     void cleanupFunctions();
 
     void devicePixelRatio();
@@ -2813,36 +2810,6 @@ 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()
-{
-    QFETCH(QString, fileName);
-
-    QImage img;
-    QRgb px;
-
-    QVERIFY(img.load(fileName));
-
-    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)
 {
     bool *called = static_cast<bool*>(info);