Merge remote-tracking branch 'mainline/master'

Conflicts:
	src/gui/image/qpnghandler.cpp

15 files changed, 442 insertions, 82 deletions

diff --git a/tests/auto/declarative/qdeclarativeimage/data/qtbug_16389.qml b/tests/auto/declarative/qdeclarativeimage/data/qtbug_16389.qml
new file mode 100644
index 0000000..29fba40
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/qtbug_16389.qml
@@ -0,0 +1,30 @@
+import QtQuick 1.0
+Rectangle {
+    width: 400
+    height: 400
+
+    Item {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.bottom: blueHandle.top
+        anchors.right: blueHandle.left
+
+        Image {
+            id: iconImage
+            objectName: "iconImage"
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            source: "heart200.png"
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+        }
+    }
+
+    Rectangle {
+        id: blueHandle
+        objectName: "blueHandle"
+        color: "blue"
+        width: 25
+        height: 25
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index f1fe2bd..9e090d2 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -89,6 +89,7 @@ private slots:
     void noLoading();
     void paintedWidthHeight();
     void sourceSize_QTBUG_14303();
+    void sourceSize_QTBUG_16389();
     void nullPixmapPaint();
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
@@ -640,6 +641,29 @@ void tst_qdeclarativeimage::sourceSize_QTBUG_14303()
     QTRY_COMPARE(sourceSizeSpy.count(), 2);
 }
 
+void tst_qdeclarativeimage::sourceSize_QTBUG_16389()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/qtbug_16389.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    QDeclarativeImage *image = findItem<QDeclarativeImage>(canvas->rootObject(), "iconImage");
+    QDeclarativeItem *handle = findItem<QDeclarativeItem>(canvas->rootObject(), "blueHandle");
+
+    QCOMPARE(image->sourceSize().width(), 200);
+    QCOMPARE(image->sourceSize().height(), 200);
+    QCOMPARE(image->paintedWidth(), 0.0);
+    QCOMPARE(image->paintedHeight(), 0.0);
+
+    handle->setY(20);
+
+    QCOMPARE(image->sourceSize().width(), 200);
+    QCOMPARE(image->sourceSize().height(), 200);
+    QCOMPARE(image->paintedWidth(), 20.0);
+    QCOMPARE(image->paintedHeight(), 20.0);
+}
+
 static int numberOfWarnings = 0;
 static void checkWarnings(QtMsgType, const char *)
 {
diff --git a/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml b/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml
index a361bdc..0f94840 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml
@@ -9,7 +9,7 @@ PathView {
         startX: 0; startY: 100
         PathLine { x: 400; y: 100 }
     }
-    delegate: Rectangle { height: 100; width: 1; color: PathView.isCurrentItem?"red" : "black" }
+    delegate: Rectangle { objectName: "wrapper"; height: 100; width: 2; color: PathView.isCurrentItem?"red" : "black" }
     dragMargin: 100
     preferredHighlightBegin: 0.5
     preferredHighlightEnd: 0.5
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index ebb5f98..8000137 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -111,6 +111,7 @@ private slots:
     void undefinedPath();
     void mouseDrag();
     void treeModel();
+    void changePreferredHighlight();
 
 private:
     QDeclarativeView *createView();
@@ -948,6 +949,45 @@ void tst_QDeclarativePathView::treeModel()
     delete canvas;
 }
 
+void tst_QDeclarativePathView::changePreferredHighlight()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setFixedSize(400,200);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/dragpath.qml"));
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject());
+    QVERIFY(pathview != 0);
+
+    int current = pathview->currentIndex();
+    QCOMPARE(current, 0);
+
+    QDeclarativeRectangle *firstItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 0);
+    QVERIFY(firstItem);
+    QDeclarativePath *path = qobject_cast<QDeclarativePath*>(pathview->path());
+    QVERIFY(path);
+    QPointF start = path->pointAt(0.5);
+    start.setX(qRound(start.x()));
+    start.setY(qRound(start.y()));
+    QPointF offset;//Center of item is at point, but pos is from corner
+    offset.setX(firstItem->width()/2);
+    offset.setY(firstItem->height()/2);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+
+    pathview->setPreferredHighlightBegin(0.8);
+    pathview->setPreferredHighlightEnd(0.8);
+    start = path->pointAt(0.8);
+    start.setX(qRound(start.x()));
+    start.setY(qRound(start.y()));
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+    QCOMPARE(pathview->currentIndex(), 0);
+
+    delete canvas;
+}
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js b/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js
new file mode 100644
index 0000000..6bdb4a5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js
@@ -0,0 +1 @@
+var data = "World"
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js
new file mode 100644
index 0000000..0385d91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js
@@ -0,0 +1,5 @@
+WorkerScript.onMessage = function(msg) {
+    var res = Qt.include("Global.js");
+    WorkerScript.sendMessage(msg + " " + data)
+}
+
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml
new file mode 100644
index 0000000..595cb2b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+BaseWorker {
+    source: "script_include.js"
+}
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index 4b922fb..b64e10c 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -79,6 +79,7 @@ private slots:
     void messaging_sendQObjectList();
     void messaging_sendJsObject();
     void script_with_pragma();
+    void script_included();
     void scriptError_onLoad();
     void scriptError_onCall();
 
@@ -226,6 +227,24 @@ void tst_QDeclarativeWorkerScript::script_with_pragma()
     delete worker;
 }
 
+void tst_QDeclarativeWorkerScript::script_included()
+{
+    QDeclarativeComponent component(&m_engine, SRCDIR "/data/worker_include.qml");
+    QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
+    QVERIFY(worker != 0);
+
+    QString value("Hello");
+
+    QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
+    waitForEchoMessage(worker);
+
+    const QMetaObject *mo = worker->metaObject();
+    QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World");
+
+    qApp->processEvents();
+    delete worker;
+}
+
 static QString qdeclarativeworkerscript_lastWarning;
 static void qdeclarativeworkerscript_warningsHandler(QtMsgType type, const char *msg)
 {
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index dacb61e..168f75e 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -447,7 +447,8 @@ private slots:
     void updateMicroFocus();
     void textItem_shortcuts();
     void scroll();
-    void stopClickFocusPropagation();
+    void focusHandling_data();
+    void focusHandling();
     void deviceCoordinateCache_simpleRotations();
 
     // task specific tests below me
@@ -10537,8 +10538,39 @@ void tst_QGraphicsItem::scroll()
     QCOMPARE(item2->lastExposedRect, expectedItem2Expose);
 }
 
-void tst_QGraphicsItem::stopClickFocusPropagation()
+Q_DECLARE_METATYPE(QGraphicsItem::GraphicsItemFlag);
+
+void tst_QGraphicsItem::focusHandling_data()
 {
+    QTest::addColumn<QGraphicsItem::GraphicsItemFlag>("focusFlag");
+    QTest::addColumn<bool>("useStickyFocus");
+    QTest::addColumn<int>("expectedFocusItem"); // 0: none, 1: focusableUnder, 2: itemWithFocus
+
+    QTest::newRow("Focus goes through.")
+        << static_cast<QGraphicsItem::GraphicsItemFlag>(0x0) << false << 1;
+
+    QTest::newRow("Focus goes through, even with sticky scene.")
+        << static_cast<QGraphicsItem::GraphicsItemFlag>(0x0) << true  << 1;
+
+    QTest::newRow("With ItemStopsClickFocusPropagation, we cannot focus the item beneath the flagged one (but can still focus-out).")
+        << QGraphicsItem::ItemStopsClickFocusPropagation << false << 0;
+
+    QTest::newRow("With ItemStopsClickFocusPropagation, we cannot focus the item beneath the flagged one (and cannot focus-out if scene is sticky).")
+        << QGraphicsItem::ItemStopsClickFocusPropagation << true << 2;
+
+    QTest::newRow("With ItemStopsFocusHandling, focus cannot be changed by presses.")
+        << QGraphicsItem::ItemStopsFocusHandling << false << 2;
+
+    QTest::newRow("With ItemStopsFocusHandling, focus cannot be changed by presses (even if scene is sticky).")
+        << QGraphicsItem::ItemStopsFocusHandling << true << 2;
+}
+
+void tst_QGraphicsItem::focusHandling()
+{
+    QFETCH(QGraphicsItem::GraphicsItemFlag, focusFlag);
+    QFETCH(bool, useStickyFocus);
+    QFETCH(int, expectedFocusItem);
+
     class MyItem : public QGraphicsRectItem
     {
     public:
@@ -10549,12 +10581,9 @@ void tst_QGraphicsItem::stopClickFocusPropagation()
         }
     };
 
-    QGraphicsScene scene(-50, -50, 400, 400);
-    scene.setStickyFocus(true);
-
     QGraphicsRectItem *noFocusOnTop = new MyItem;
+    noFocusOnTop->setFlag(QGraphicsItem::ItemIsFocusable, false);
     noFocusOnTop->setBrush(Qt::yellow);
-    noFocusOnTop->setFlag(QGraphicsItem::ItemStopsClickFocusPropagation);
 
     QGraphicsRectItem *focusableUnder = new MyItem;
     focusableUnder->setBrush(Qt::blue);
@@ -10566,9 +10595,13 @@ void tst_QGraphicsItem::stopClickFocusPropagation()
     itemWithFocus->setFlag(QGraphicsItem::ItemIsFocusable);
     itemWithFocus->setPos(250, 10);
 
+    QGraphicsScene scene(-50, -50, 400, 400);
     scene.addItem(noFocusOnTop);
     scene.addItem(focusableUnder);
     scene.addItem(itemWithFocus);
+    scene.setStickyFocus(useStickyFocus);
+
+    noFocusOnTop->setFlag(focusFlag);
     focusableUnder->stackBefore(noFocusOnTop);
     itemWithFocus->setFocus();
 
@@ -10580,14 +10613,28 @@ void tst_QGraphicsItem::stopClickFocusPropagation()
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
     QVERIFY(itemWithFocus->hasFocus());
 
-    QPointF mousePressPoint = noFocusOnTop->mapToScene(QPointF());
-    mousePressPoint.rx() += 60;
-    mousePressPoint.ry() += 60;
+    const QPointF mousePressPoint = noFocusOnTop->mapToScene(noFocusOnTop->boundingRect().center());
     const QList<QGraphicsItem *> itemsAtMousePressPosition = scene.items(mousePressPoint);
-    QVERIFY(itemsAtMousePressPosition.contains(focusableUnder));
+    QVERIFY(itemsAtMousePressPosition.contains(noFocusOnTop));
 
     sendMousePress(&scene, mousePressPoint);
-    QVERIFY(itemWithFocus->hasFocus());
+
+    switch (expectedFocusItem) {
+    case 0:
+        QCOMPARE(scene.focusItem(), static_cast<QGraphicsRectItem *>(0));
+        break;
+    case 1:
+        QCOMPARE(scene.focusItem(), focusableUnder);
+        break;
+    case 2:
+        QCOMPARE(scene.focusItem(), itemWithFocus);
+        break;
+    }
+
+    // Sanity check - manually setting the focus must work regardless of our
+    // focus handling flags:
+    focusableUnder->setFocus();
+    QCOMPARE(scene.focusItem(), focusableUnder);
 }
 
 void tst_QGraphicsItem::deviceCoordinateCache_simpleRotations()
diff --git a/tests/auto/qimagereader/images/txts.png b/tests/auto/qimagereader/images/txts.png
new file mode 100755
index 0000000..99be1eb
--- /dev/null
+++ b/tests/auto/qimagereader/images/txts.png
diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/qimagereader/qimagereader.qrc
index 5536b38..632b73a 100644
--- a/tests/auto/qimagereader/qimagereader.qrc
+++ b/tests/auto/qimagereader/qimagereader.qrc
@@ -64,5 +64,6 @@
         <file>images/corrupt.svg</file>
         <file>images/corrupt.svgz</file>
         <file>images/qtbug13653-no_eoi.jpg</file>
+        <file>images/txts.png</file>
     </qresource>
 </RCC>
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index f02fd6a..5db5f56 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -183,6 +183,9 @@ private slots:
     void saveFormat_data();
     void saveFormat();
 
+    void readText_data();
+    void readText();
+
     void preserveTexts_data();
     void preserveTexts();
 };
@@ -1968,6 +1971,31 @@ void tst_QImageReader::saveFormat()
 }
 
 
+void tst_QImageReader::readText_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QString>("key");
+    QTest::addColumn<QString>("text");
+
+    QTest::newRow("png, tEXt before img") << "txts.png" << "Title" << "PNG";
+    QTest::newRow("png, zTXt before img") << "txts.png" << "Comment" << "Some compressed text.";
+    QTest::newRow("png, tEXt after img") << "txts.png" << "Disclaimer" << "For testing only.";
+    QTest::newRow("png, zTXt after img") << "txts.png" << "Description" << "Rendered by Persistence of Vision (tm) Ray Tracer";
+}
+
+
+void tst_QImageReader::readText()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QString, key);
+    QFETCH(QString, text);
+
+    QImage img(prefix + fileName);
+    QVERIFY(img.textKeys().contains(key));
+    QCOMPARE(img.text(key), text);
+}
+
+
 void tst_QImageReader::preserveTexts_data()
 {
     QTest::addColumn<QString>("text");
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 49ae768..2c79951 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -345,6 +345,8 @@ private Q_SLOTS:
 
     void httpAbort();
 
+    void dontInsertPartialContentIntoTheCache();
+
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
 };
@@ -589,6 +591,63 @@ public:
 Q_DECLARE_METATYPE(MyMemoryCache::CachedContent)
 Q_DECLARE_METATYPE(MyMemoryCache::CacheData)
 
+class MySpyMemoryCache: public QAbstractNetworkCache
+{
+public:
+    MySpyMemoryCache(QObject *parent) : QAbstractNetworkCache(parent) {}
+    ~MySpyMemoryCache()
+    {
+        qDeleteAll(m_buffers);
+        m_buffers.clear();
+    }
+
+    QHash<QUrl, QIODevice*> m_buffers;
+    QList<QUrl> m_insertedUrls;
+
+    QNetworkCacheMetaData metaData(const QUrl &)
+    {
+        return QNetworkCacheMetaData();
+    }
+
+    void updateMetaData(const QNetworkCacheMetaData &)
+    {
+    }
+
+    QIODevice *data(const QUrl &)
+    {
+        return 0;
+    }
+
+    bool remove(const QUrl &url)
+    {
+        delete m_buffers.take(url);
+        return m_insertedUrls.removeAll(url) > 0;
+    }
+
+    qint64 cacheSize() const
+    {
+        return 0;
+    }
+
+    QIODevice *prepare(const QNetworkCacheMetaData &metaData)
+    {
+        QBuffer* buffer = new QBuffer;
+        buffer->open(QIODevice::ReadWrite);
+        buffer->setProperty("url", metaData.url());
+        m_buffers.insert(metaData.url(), buffer);
+        return buffer;
+    }
+
+    void insert(QIODevice *buffer)
+    {
+        QUrl url = buffer->property("url").toUrl();
+        m_insertedUrls << url;
+        delete m_buffers.take(url);
+    }
+
+    void clear() { m_insertedUrls.clear(); }
+};
+
 class DataReader: public QObject
 {
     Q_OBJECT
@@ -2696,6 +2755,7 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
     QTest::addColumn<QString>("body");
     QTest::addColumn<MyMemoryCache::CachedContent>("cachedReply");
     QTest::addColumn<int>("cacheMode");
+    QTest::addColumn<QStringList>("extraHttpHeaders");
     QTest::addColumn<bool>("loadedFromCache");
     QTest::addColumn<bool>("networkUsed");
 
@@ -2713,11 +2773,11 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
             "\r\n";
 
     QTest::newRow("not-cached,always-network")
-            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::AlwaysNetwork) << false << true;
+            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::AlwaysNetwork) << QStringList() << false << true;
     QTest::newRow("not-cached,prefer-network")
-            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::PreferNetwork) << false << true;
+            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::PreferNetwork) << QStringList() << false << true;
     QTest::newRow("not-cached,prefer-cache")
-            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::PreferCache) << false << true;
+            << reply200 << "Reloaded" << MyMemoryCache::CachedContent() << int(QNetworkRequest::PreferCache) << QStringList() << false << true;
 
     QDateTime present = QDateTime::currentDateTime().toUTC();
     QDateTime past = present.addSecs(-3600);
@@ -2739,14 +2799,14 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
     content.first.setLastModified(past);
 
     QTest::newRow("expired,200,prefer-network")
-            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << false << true;
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << false << true;
     QTest::newRow("expired,200,prefer-cache")
-            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferCache) << false << true;
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << false << true;
 
     QTest::newRow("expired,304,prefer-network")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << true << true;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << true << true;
     QTest::newRow("expired,304,prefer-cache")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << true << true;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << true;
 
     //
     // Set to not-expired
@@ -2758,20 +2818,20 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
     content.first.setExpirationDate(future);
 
     QTest::newRow("not-expired,200,always-network")
-            << reply200 << "Reloaded" << content << int(QNetworkRequest::AlwaysNetwork) << false << true;
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::AlwaysNetwork) << QStringList() << false << true;
     QTest::newRow("not-expired,200,prefer-network")
-            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << true << false;
+            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << true << false;
     QTest::newRow("not-expired,200,prefer-cache")
-            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << true << false;
+            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << false;
     QTest::newRow("not-expired,200,always-cache")
-            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << true << false;
+            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << QStringList() << true << false;
 
     QTest::newRow("not-expired,304,prefer-network")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << true << false;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << true << false;
     QTest::newRow("not-expired,304,prefer-cache")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << true << false;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << false;
     QTest::newRow("not-expired,304,always-cache")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << true << false;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << QStringList() << true << false;
 
     //
     // Set must-revalidate now
@@ -2782,20 +2842,42 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
     content.first.setRawHeaders(rawHeaders);
 
     QTest::newRow("must-revalidate,200,always-network")
-            << reply200 << "Reloaded" << content << int(QNetworkRequest::AlwaysNetwork) << false << true;
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::AlwaysNetwork) << QStringList() << false << true;
     QTest::newRow("must-revalidate,200,prefer-network")
-            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << false << true;
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << false << true;
     QTest::newRow("must-revalidate,200,prefer-cache")
-            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << true << false;
+            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << false;
     QTest::newRow("must-revalidate,200,always-cache")
-            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << true << false;
+            << reply200 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << QStringList() << true << false;
 
     QTest::newRow("must-revalidate,304,prefer-network")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << true << true;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << true << true;
     QTest::newRow("must-revalidate,304,prefer-cache")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << true << false;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << false;
     QTest::newRow("must-revalidate,304,always-cache")
-            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << true << false;
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::AlwaysCache) << QStringList() << true << false;
+
+    //
+    // Partial content
+    //
+    rawHeaders.clear();
+    rawHeaders << QNetworkCacheMetaData::RawHeader("Date", QLocale::c().toString(past, dateFormat).toLatin1())
+            << QNetworkCacheMetaData::RawHeader("Cache-control", "max-age=7200"); // isn't used in cache loading
+    content.first.setRawHeaders(rawHeaders);
+    content.first.setExpirationDate(future);
+
+    QByteArray reply206 =
+            "HTTP/1.0 206\r\n"
+            "Connection: keep-alive\r\n"
+            "Content-Type: text/plain\r\n"
+            "Cache-control: no-cache\r\n"
+            "Content-Range: bytes 2-6/8\r\n"
+            "Content-length: 4\r\n"
+            "\r\n"
+            "load";
+
+    QTest::newRow("partial,dontuse-cache")
+            << reply206 << "load" << content << int(QNetworkRequest::PreferCache) << (QStringList() << "Range" << "bytes=2-6") << false << true;
 }
 
 void tst_QNetworkReply::ioGetFromHttpWithCache()
@@ -2817,6 +2899,15 @@ void tst_QNetworkReply::ioGetFromHttpWithCache()
     QNetworkRequest request(url);
     request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, cacheMode);
     request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
+
+    QFETCH(QStringList, extraHttpHeaders);
+    QStringListIterator it(extraHttpHeaders);
+    while (it.hasNext()) {
+        QString header = it.next();
+        QString value = it.next();
+        request.setRawHeader(header.toLatin1(), value.toLatin1()); // To latin1? Deal with it!
+    }
+
     QNetworkReplyPtr reply = manager.get(request);
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
@@ -5572,6 +5663,39 @@ void tst_QNetworkReply::httpAbort()
     // It must not crash either.
 }
 
+void tst_QNetworkReply::dontInsertPartialContentIntoTheCache()
+{
+    QByteArray reply206 =
+            "HTTP/1.0 206\r\n"
+            "Connection: keep-alive\r\n"
+            "Content-Type: text/plain\r\n"
+            "Cache-control: no-cache\r\n"
+            "Content-Range: bytes 2-6/8\r\n"
+            "Content-length: 4\r\n"
+            "\r\n"
+            "load";
+
+    MiniHttpServer server(reply206);
+    server.doClose = false;
+
+    MySpyMemoryCache *memoryCache = new MySpyMemoryCache(&manager);
+    manager.setCache(memoryCache);
+
+    QUrl url = "http://localhost:" + QString::number(server.serverPort());
+    QNetworkRequest request(url);
+    request.setRawHeader("Range", "bytes=2-6");
+
+    QNetworkReplyPtr reply = manager.get(request);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QVERIFY(server.totalConnections > 0);
+    QCOMPARE(reply->readAll().constData(), "load");
+    QCOMPARE(memoryCache->m_insertedUrls.count(), 0);
+}
+
 // NOTE: This test must be last testcase in tst_qnetworkreply!
 void tst_QNetworkReply::parentingRepliesToTheApp()
 {
@@ -5581,4 +5705,5 @@ void tst_QNetworkReply::parentingRepliesToTheApp()
 }
 
 QTEST_MAIN(tst_QNetworkReply)
+
 #include "tst_qnetworkreply.moc"
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
index 4f4e706a..1952796 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -61,6 +61,9 @@
 #include <private/qtextengine_p.h>
 #include <qtextlayout.h>
 #undef private
+#else
+#include <private/qtextengine_p.h>
+#include <qtextlayout.h>
 #endif
 
 #include <qfontdatabase.h>
@@ -105,6 +108,9 @@ private slots:
     void linearB();
     void controlInSyllable_qtbug14204();
     void combiningMarks_qtbug15675();
+
+    void mirroredChars_data();
+    void mirroredChars();
 };
 
 tst_QTextScriptEngine::tst_QTextScriptEngine()
@@ -1151,9 +1157,86 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675()
 
     QVERIFY(e->layoutData->items[0].num_glyphs == 4);
     QVERIFY(e->layoutData->glyphLayout.advances_y[2] > 0);
+#elif defined(Q_WS_X11)
+    QFontDatabase db;
+
+    if (!db.families().contains("DejaVu Sans Mono")) {
+        QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test.", SkipAll);
+        return;
+    }
+
+    QString s;
+    s.append(QChar(0x0062));
+    s.append(QChar(0x0332));
+    s.append(QChar(0x0063));
+
+    QTextLayout layout(s, QFont("DejaVu Sans Mono"));
+    QTextEngine *e = layout.d;
+    e->itemize();
+    e->shape(0);
+
+    QVERIFY(e->layoutData->items[0].num_glyphs == 3);
+    QVERIFY(e->layoutData->glyphLayout.advances_x[1] == 0);
 #else
-    QSKIP("Mac specific test", SkipAll);
+    QSKIP("X11/Mac specific test", SkipAll);
+#endif
+}
+
+void tst_QTextScriptEngine::mirroredChars_data()
+{
+    QTest::addColumn<int>("hintingPreference");
+
+    QTest::newRow("Default hinting") << int(QFont::PreferDefaultHinting);
+    QTest::newRow("No hinting") << int(QFont::PreferNoHinting);
+    QTest::newRow("Vertical hinting") << int(QFont::PreferVerticalHinting);
+    QTest::newRow("Full hinting") << int(QFont::PreferFullHinting);
+}
+
+void tst_QTextScriptEngine::mirroredChars()
+{
+#if defined(Q_WS_MAC)
+    QSKIP("Not supported on Mac", SkipAll);
 #endif
+    QFETCH(int, hintingPreference);
+
+    QFont font;
+    font.setHintingPreference(QFont::HintingPreference(hintingPreference));
+
+    QString s;
+    s.append(QLatin1Char('('));
+    s.append(QLatin1Char(')'));
+
+    HB_Glyph leftParenthesis;
+    HB_Glyph rightParenthesis;
+    {
+        QTextLayout layout(s);
+        layout.beginLayout();
+        layout.createLine();
+        layout.endLayout();
+
+        QTextEngine *e = layout.engine();
+        e->itemize();
+        e->shape(0);
+        QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(2));
+
+        const QGlyphLayout &glyphLayout = e->layoutData->glyphLayout;
+        leftParenthesis = glyphLayout.glyphs[0];
+        rightParenthesis = glyphLayout.glyphs[1];
+    }
+
+    {
+        QTextLayout layout(s);
+        layout.setFlags(Qt::TextForceRightToLeft);
+
+        QTextEngine *e = layout.engine();
+        e->itemize();
+        e->shape(0);
+        QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(2));
+
+        const QGlyphLayout &glyphLayout = e->layoutData->glyphLayout;
+        QCOMPARE(glyphLayout.glyphs[0], rightParenthesis);
+        QCOMPARE(glyphLayout.glyphs[1], leftParenthesis);
+    }
 }
 
 QTEST_MAIN(tst_QTextScriptEngine)
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index b309917..b209258 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -66,7 +66,6 @@ private slots:
     void getSetWindowSurface();
     void flushOutsidePaintEvent();
     void grabWidget();
-    void staticContentsAndPartialUpdateSupport();
 };
 
 class MyWindowSurface : public QWindowSurface
@@ -82,8 +81,6 @@ public:
         /* nothing */
     }
 
-    using QWindowSurface::setStaticContentsSupport;
-    using QWindowSurface::setPartialUpdateSupport;
 private:
     QImage image;
 };
@@ -283,51 +280,6 @@ void tst_QWindowSurface::grabWidget()
     QVERIFY(QColor(childInvalidSubImage.pixel(0, 0)) == QColor(Qt::white));
 }
 
-void tst_QWindowSurface::staticContentsAndPartialUpdateSupport()
-{
-    QWidget widget;
-    MyWindowSurface surface(&widget);
-
-    // Default values.
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: YES
-    surface.setStaticContentsSupport(true);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(surface.hasStaticContentsSupport());
-
-    // Static contents requires support for partial updates.
-    // We simply ingore bad combinations and spit out a warning.
-
-    // CONFLICT: Partial: NO, Static: YES
-    QTest::ignoreMessage(QtWarningMsg, "QWindowSurface::setPartialUpdateSupport: static contents support requires partial update support");
-    surface.setPartialUpdateSupport(false);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: NO
-    surface.setStaticContentsSupport(false);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: NO, Static: NO
-    surface.setPartialUpdateSupport(false);
-    QVERIFY(!surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // CONFLICT: Partial: NO, Static: YES
-    QTest::ignoreMessage(QtWarningMsg, "QWindowSurface::setStaticContentsSupport: static contents support requires partial update support");
-    surface.setStaticContentsSupport(true);
-    QVERIFY(!surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: NO
-    surface.setPartialUpdateSupport(true);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-}
-
 QTEST_MAIN(tst_QWindowSurface)
 
 #else // Q_WS_MAC