Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Conflicts:
	src/gui/text/qfontdatabase.cpp
	src/gui/text/qharfbuzz_copy_p.h
	src/widgets/kernel/qapplication.cpp
	src/widgets/kernel/qcoreapplication.cpp

Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b

8 files changed, 103 insertions, 38 deletions

diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro
index 1ef52df4ba..9199763c40 100644
--- a/tests/auto/gui/image/image.pro
+++ b/tests/auto/gui/image/image.pro
@@ -11,6 +11,9 @@ SUBDIRS=\
    qpicture \
    qicon \
 
+!qtHaveModule(network): SUBDIRS -= \
+    qimagereader
+
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
            qpixmapcache \
 
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 11fd5f9b2e..c21f725b55 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -80,7 +80,7 @@ private:
     const static QIcon staticIcon;
 };
 
-// Creating an icon statically should not cause a crash. 
+// Creating an icon statically should not cause a crash.
 // But we do not officially support this. See QTBUG-8666
 const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find");
 
diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
index d76e954ccd..f7d8eef721 100644
--- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
@@ -63,7 +63,7 @@ class MyImageIOHandler : public QImageIOHandler
 {
 public:
     MyImageIOHandler() : QImageIOHandler() { }
-    bool canRead() const { return true; }    
+    bool canRead() const { return true; }
     bool read(QImage *) { return true; }
 };
 
diff --git a/tests/auto/gui/image/qimagereader/images/black.xpm b/tests/auto/gui/image/qimagereader/images/black.xpm
index d7925bf211..4a1f4ec861 100644
--- a/tests/auto/gui/image/qimagereader/images/black.xpm
+++ b/tests/auto/gui/image/qimagereader/images/black.xpm
@@ -15,21 +15,21 @@ static char * ddd_xpm[] = {
 "+ c white     m white g white  g4 white  s Light      ",
 "*      c DarkGreen m black g grey25 g4 grey25 s Eye        ",
 /* Pixels */
-"                .            .                  ",    
-"                .           ..                  ",    
-"                 .          .                   ",    
-"                 ..        .                    ",    
-"   ..             ..      ..                    ",    
-"     ..            .     .               .      ",    
-"       .            . . .              ..       ",    
-"        .            .X.              .         ",    
-"         .          *.X.*           ..          ",    
-"         ..     ..  .XXX.  ..     ...           ",    
-"          .     .X...XXX...X.     .             ",    
-"          ..   ..XXX.XXX.XXX.   ..              ",    
-"            .....XXXX...XXXX.   .               ",    
-"             .. ..XXXXXXXXX.. ..                ",    
-"                ...XXXXXXX.....                 ",    
+"                .            .                  ",
+"                .           ..                  ",
+"                 .          .                   ",
+"                 ..        .                    ",
+"   ..             ..      ..                    ",
+"     ..            .     .               .      ",
+"       .            . . .              ..       ",
+"        .            .X.              .         ",
+"         .          *.X.*           ..          ",
+"         ..     ..  .XXX.  ..     ...           ",
+"          .     .X...XXX...X.     .             ",
+"          ..   ..XXX.XXX.XXX.   ..              ",
+"            .....XXXX...XXXX.   .               ",
+"             .. ..XXXXXXXXX.. ..                ",
+"                ...XXXXXXX.....                 ",
 "                  .........                     ",
 "                  .XXXXXXX.                     ",
 "                .....XXX.....                   ",
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 4b3db26685..b684231e10 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -94,6 +94,7 @@ private slots:
     void multiWordNamedColorXPM();
 
     void supportedFormats();
+    void supportedMimeTypes();
 
     void readFromDevice_data();
     void readFromDevice();
@@ -571,6 +572,26 @@ void tst_QImageReader::supportedFormats()
     QCOMPARE(formatSet.size(), formats.size());
 }
 
+void tst_QImageReader::supportedMimeTypes()
+{
+    QList<QByteArray> mimeTypes = QImageReader::supportedMimeTypes();
+    QList<QByteArray> sortedMimeTypes = mimeTypes;
+    qSort(sortedMimeTypes);
+
+    // check that the list is sorted
+    QCOMPARE(mimeTypes, sortedMimeTypes);
+
+    QSet<QByteArray> mimeTypeSet;
+    foreach (QByteArray mimeType, mimeTypes)
+        mimeTypeSet << mimeType;
+
+    // check the list as a minimum contains image/bmp
+    QVERIFY(mimeTypeSet.contains("image/bmp"));
+
+    // check that the list does not contain duplicates
+    QCOMPARE(mimeTypeSet.size(), mimeTypes.size());
+}
+
 void tst_QImageReader::setBackgroundColor_data()
 {
     QTest::addColumn<QString>("fileName");
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index 3c36482d62..f1d0e227f6 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -81,6 +81,7 @@ private slots:
     void writeImage2_data();
     void writeImage2();
     void supportedFormats();
+    void supportedMimeTypes();
 
     void writeToInvalidDevice();
 
@@ -352,6 +353,26 @@ void tst_QImageWriter::supportedFormats()
     QCOMPARE(formatSet.size(), formats.size());
 }
 
+void tst_QImageWriter::supportedMimeTypes()
+{
+    QList<QByteArray> mimeTypes = QImageWriter::supportedMimeTypes();
+    QList<QByteArray> sortedMimeTypes = mimeTypes;
+    qSort(sortedMimeTypes);
+
+    // check that the list is sorted
+    QCOMPARE(mimeTypes, sortedMimeTypes);
+
+    QSet<QByteArray> mimeTypeSet;
+    foreach (QByteArray mimeType, mimeTypes)
+        mimeTypeSet << mimeType;
+
+    // check the list as a minimum contains image/bmp
+    QVERIFY(mimeTypeSet.contains("image/bmp"));
+
+    // check that the list does not contain duplicates
+    QCOMPARE(mimeTypeSet.size(), mimeTypes.size());
+}
+
 void tst_QImageWriter::writeToInvalidDevice()
 {
     QLatin1String fileName("/these/directories/do/not/exist/001.png");
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index 3e628981b6..2e766c5bf5 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -174,28 +174,28 @@ void tst_QPicture::operator_lt_lt()
 {
     // streaming of null pictures
     {
-	QPicture pic1, pic2;
-	QByteArray ba( 100, 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
- 	QVERIFY( pic2.isNull() );
+        QPicture pic1, pic2;
+        QByteArray ba( 100, 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QVERIFY( pic2.isNull() );
     }
 
     // picture with a simple line, checking bitwise equality
     {
-	QPicture pic1, pic2;
-	QPainter p( &pic1 );
-	p.drawLine( 10, 20, 30, 40 );
-	p.end();
-	QByteArray ba( 10 * pic1.size(), 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
-	QCOMPARE( pic1.size(), pic2.size() );
-	QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
+        QPicture pic1, pic2;
+        QPainter p( &pic1 );
+        p.drawLine( 10, 20, 30, 40 );
+        p.end();
+        QByteArray ba( 10 * pic1.size(), 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QCOMPARE( pic1.size(), pic2.size() );
+        QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
     }
 }
 
@@ -268,7 +268,6 @@ void tst_QPicture::boundaryValues_data()
 
     QTest::newRow("min x, max y") << INT_MIN << INT_MAX;
     QTest::newRow("max x, min y") << INT_MAX << INT_MIN;
-
 }
 
 void tst_QPicture::boundaryValues()
@@ -283,8 +282,6 @@ void tst_QPicture::boundaryValues()
     painter.drawPoint(QPoint(x, y));
 
     painter.end();
-
-    
 }
 
 
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 61f53a5073..531ec68fdc 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -114,6 +114,7 @@ private slots:
 
     void convertFromImageNoDetach();
     void convertFromImageDetach();
+    void convertFromImageCacheKey();
 
 #if defined(Q_OS_WIN)
     void toWinHBITMAP_data();
@@ -782,6 +783,28 @@ void tst_QPixmap::convertFromImageDetach()
     QVERIFY(copy.isDetached());
 }
 
+void tst_QPixmap::convertFromImageCacheKey()
+{
+    QPixmap randomPixmap(10, 10);
+    if (randomPixmap.handle()->classId() != QPlatformPixmap::RasterClass)
+        QSKIP("Test only valid for raster pixmaps");
+
+    //first get the screen format
+    QImage::Format screenFormat = randomPixmap.toImage().format();
+    QVERIFY(screenFormat != QImage::Format_Invalid);
+
+    QImage orig(100,100, screenFormat);
+    orig.fill(0);
+
+    QPixmap pix = QPixmap::fromImage(orig);
+    QImage copy = pix.toImage();
+
+    QVERIFY(copy.format() == screenFormat);
+
+    QCOMPARE(orig.cacheKey(), pix.cacheKey());
+    QCOMPARE(copy.cacheKey(), pix.cacheKey());
+}
+
 #if defined(Q_OS_WIN)
 
 QT_BEGIN_NAMESPACE