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

Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e

6 files changed, 138 insertions, 13 deletions

diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index e7a022bdec..e969724117 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -109,14 +109,11 @@ void tst_QMimeDatabase::initTestCase()
     if (m_testSuite.isEmpty())
         qWarning("%s", qPrintable(testSuiteWarning()));
 
+    const QString errorMessage = QString::fromLatin1("Cannot find '%1'");
     m_yastMimeTypes = QLatin1String(RESOURCE_PREFIX) + yastFileName;
-    QVERIFY2(!m_yastMimeTypes.isEmpty(),
-             qPrintable(QString::fromLatin1("Cannot find '%1' starting from '%2'").
-                        arg(yastFileName, QDir::currentPath())));
+    QVERIFY2(QFile::exists(m_yastMimeTypes), qPrintable(errorMessage.arg(yastFileName)));
     m_qmlAgainFileName = QLatin1String(RESOURCE_PREFIX) + qmlAgainFileName;
-    QVERIFY2(!m_qmlAgainFileName.isEmpty(),
-             qPrintable(QString::fromLatin1("Cannot find '%1' starting from '%2'").
-                        arg(qmlAgainFileName, QDir::currentPath())));
+    QVERIFY2(QFile::exists(m_qmlAgainFileName), qPrintable(errorMessage.arg(qmlAgainFileName)));
 
     init();
 }
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 0ab483222d..7d2d009213 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -2507,6 +2507,19 @@ void tst_QImage::inplaceConversion()
     }
     if (image.depth() == imageConverted.depth())
         QCOMPARE(imageConverted.constScanLine(0), originalPtr);
+
+    {
+        // Test attempted inplace conversion of images created on existing, readonly buffer
+        static const quint32 readOnlyData[] = { 0x00010203U, 0x04050607U, 0x08091011U, 0x12131415U };
+
+        QImage roImage((const uchar *)readOnlyData, 2, 2, format);
+        QImage inplaceConverted = std::move(roImage).convertToFormat(dest_format);
+
+        QImage roImage2((const uchar *)readOnlyData, 2, 2, format);
+        QImage normalConverted = roImage2.convertToFormat(dest_format);
+
+        QCOMPARE(normalConverted, inplaceConverted);
+    }
 #endif
 }
 
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 0ee066be63..c8d3122e6d 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -44,6 +44,11 @@
 #ifndef QT_NO_WIDGETS
 #include <qtextedit.h>
 #endif
+#ifndef QT_NO_PRINTER
+#include <QPagedPaintDevice>
+#include <QPainter>
+#include <QPaintEngine>
+#endif
 
 typedef QList<int> IntList;
 
@@ -96,6 +101,9 @@ private slots:
     void QTBUG11282_insertBeforeMergedEnding();
 #endif
     void QTBUG22011_insertBeforeRowSpan();
+#ifndef QT_NO_PRINTER
+    void QTBUG31330_renderBackground();
+#endif
 
 private:
     QTextTable *create2x2Table();
@@ -1024,5 +1032,112 @@ void tst_QTextTable::QTBUG22011_insertBeforeRowSpan()
     QCOMPARE(table->columns(), 6);
 }
 
+#ifndef QT_NO_PRINTER
+namespace {
+class QTBUG31330_PaintDevice : public QPagedPaintDevice
+{
+public:
+    class PaintEngine : public QPaintEngine
+    {
+    public:
+        QList<QRectF> rects;
+
+        PaintEngine()
+            : QPaintEngine(0)
+        {}
+        virtual Type type() const
+        {
+            return User;
+        }
+        virtual bool begin(QPaintDevice *)
+        {
+            return true;
+        }
+        virtual bool end()
+        {
+            return true;
+        }
+        virtual void updateState(const QPaintEngineState &)
+        {}
+        virtual void drawRects(const QRect *, int)
+        {}
+        virtual void drawRects(const QRectF *r, int)
+        {
+            if (painter()->brush() == QBrush(Qt::green))
+            {
+                rects.append(*r);
+            }
+        }
+        virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &)
+        {}
+    };
+
+    int pages;
+    QPaintEngine* engine;
+
+    QTBUG31330_PaintDevice(QPaintEngine* engine)
+        : pages(1), engine(engine)
+    {
+        QPageLayout layout = pageLayout();
+        layout.setUnits(QPageLayout::Point);
+        setPageLayout(layout);
+    }
+    virtual int metric(PaintDeviceMetric metric) const
+    {
+        if (PdmDevicePixelRatio == metric)
+            return 1;
+        if (PdmDpiY == metric)
+            return 96;
+        if (PdmDpiX == metric)
+            return 96;
+        if (PdmHeight == metric)
+            return 1000;
+        if (PdmWidth == metric)
+            return 700;
+        return 900;
+    }
+    virtual QPaintEngine *paintEngine() const
+    {
+        return engine;
+    }
+    bool newPage()
+    {
+        ++pages;
+        return true;
+    }
+};
+}
+
+void tst_QTextTable::QTBUG31330_renderBackground()
+{
+    QTextDocument doc;
+    QTextCursor cursor(&doc);
+    QTextTable* table = cursor.insertTable(4, 2);
+
+    QTextTableCell cell = table->cellAt(3, 0);
+
+    QTextCharFormat cellFormat = cell.format();
+    cellFormat.setBackground(QBrush(Qt::green));
+    cell.setFormat(cellFormat);
+
+    QTextCursor tc = cell.firstCursorPosition();
+    for (int i = 0; i < 60; ++i) {
+        tc.insertBlock();
+    }
+    QTBUG31330_PaintDevice::PaintEngine engine;
+    QTBUG31330_PaintDevice paintDevice(&engine);
+    paintDevice.setPageSize(QPagedPaintDevice::A4);
+    doc.print(&paintDevice);
+
+    QVERIFY(paintDevice.pages >= 2);
+    QCOMPARE(engine.rects.count(), paintDevice.pages);
+    for (int i = 0; i < engine.rects.count(); ++i) {
+        QRectF rect = engine.rects[i];
+        QVERIFY(rect.top() > 0);
+        QVERIFY(rect.bottom() < 1000);
+    }
+}
+#endif
+
 QTEST_MAIN(tst_QTextTable)
 #include "tst_qtexttable.moc"
diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
index ee7138f001..e13c80c719 100644
--- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
+++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -67,8 +67,8 @@ private slots:
 void tst_QDnsLookup::initTestCase()
 {
     QTest::addColumn<QString>("tld");
-    QTest::newRow("normal") << ".test.qt-project.org";
-    QTest::newRow("idn") << ".alqualond\xc3\xab.test.qt-project.org";
+    QTest::newRow("normal") << ".test.macieira.org";
+    QTest::newRow("idn") << ".alqualond\xc3\xab.test.macieira.org";
 }
 
 QString tst_QDnsLookup::domainName(const QString &input)
@@ -145,8 +145,8 @@ void tst_QDnsLookup::lookup_data()
 
     QTest::newRow("ns-empty") << int(QDnsLookup::NS) << "" << int(QDnsLookup::InvalidRequestError) << "" << "" << "" << "" << "" << "" << "";
     QTest::newRow("ns-notfound") << int(QDnsLookup::NS) << "invalid.invalid" << int(QDnsLookup::NotFoundError) << "" << "" << "" << "" << "" << "" << "";
-    QTest::newRow("ns-single") << int(QDnsLookup::NS) << "ns-single" << int(QDnsLookup::NoError) << "" << "" << "" << "ns-foo.linpro.net." << "" << "" << "";
-    QTest::newRow("ns-multi") << int(QDnsLookup::NS) << "ns-multi" << int(QDnsLookup::NoError) << "" << "" << "" << "ns-bar.linpro.net.;ns-foo.linpro.net." << "" << "" << "";
+    QTest::newRow("ns-single") << int(QDnsLookup::NS) << "ns-single" << int(QDnsLookup::NoError) << "" << "" << "" << "ns3.macieira.info." << "" << "" << "";
+    QTest::newRow("ns-multi") << int(QDnsLookup::NS) << "ns-multi" << int(QDnsLookup::NoError) << "" << "" << "" << "gondolin.macieira.info.;ns3.macieira.info." << "" << "" << "";
 
     QTest::newRow("ptr-empty") << int(QDnsLookup::PTR) << "" << int(QDnsLookup::InvalidRequestError) << "" << "" << "" << "" << "" << "" << "";
     QTest::newRow("ptr-notfound") << int(QDnsLookup::PTR) << "invalid.invalid" << int(QDnsLookup::NotFoundError) << "" << "" << "" << "" << "" << "" << "";
diff --git a/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp b/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
index 2ca6e7b6f3..8b9a13023c 100644
--- a/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
+++ b/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
@@ -48,7 +48,7 @@ private slots:
 void tst_QDnsLookup_Appless::noApplication()
 {
     QTest::ignoreMessage(QtWarningMsg, "QDnsLookup requires a QCoreApplication");
-    QDnsLookup dns(QDnsLookup::A, "a-single.test.qt-project.org");
+    QDnsLookup dns(QDnsLookup::A, "a-single.test.macieira.org");
     dns.lookup();
 }
 
@@ -58,7 +58,7 @@ void tst_QDnsLookup_Appless::recreateApplication()
     char **argv = 0;
     for (int i = 0; i < 10; ++i) {
         QCoreApplication app(argc, argv);
-        QDnsLookup dns(QDnsLookup::A, "a-single.test.qt-project.org");
+        QDnsLookup dns(QDnsLookup::A, "a-single.test.macieira.org");
         dns.lookup();
         if (!dns.isFinished()) {
             QObject::connect(&dns, SIGNAL(finished()),
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index c63a8336fb..9762e8244c 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -85,7 +85,7 @@
 
 #include "../../../network-settings.h"
 
-#define TEST_DOMAIN ".test.qt-project.org"
+#define TEST_DOMAIN ".test.macieira.org"
 
 
 class tst_QHostInfo : public QObject