8 files changed, 90 insertions, 4 deletions
diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro
index bdd0c15788..33c301a500 100644
--- a/tests/auto/gui/image/qpixmap/qpixmap.pro
+++ b/tests/auto/gui/image/qpixmap/qpixmap.pro
@@ -5,7 +5,7 @@ QT += core-private gui-private testlib
 qtHaveModule(widgets): QT += widgets widgets-private
 
 SOURCES  += tst_qpixmap.cpp
-!wince* {
+!wince*:!winrt {
    win32:LIBS += -lgdi32 -luser32
 }
 
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index cb5d836291..79dc3f311a 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -116,7 +116,7 @@ private slots:
     void convertFromImageDetach();
     void convertFromImageCacheKey();
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
     void toWinHBITMAP_data();
     void toWinHBITMAP();
     void fromWinHBITMAP_data();
@@ -805,7 +805,7 @@ void tst_QPixmap::convertFromImageCacheKey()
     QCOMPARE(copy.cacheKey(), pix.cacheKey());
 }
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
 
 QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT HBITMAP qt_createIconMask(const QBitmap &bitmap);
@@ -1024,7 +1024,7 @@ void tst_QPixmap::fromWinHICON()
 #endif // Q_OS_WINCE
 }
 
-#endif // Q_OS_WIN
+#endif // Q_OS_WIN && !Q_OS_WINRT
 
 void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
 {
diff --git a/tests/auto/gui/kernel/qguivariant/test/black.png b/tests/auto/gui/kernel/qguivariant/test/black.png
new file mode 100644
index 0000000000..6c94085ed5
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/black.png
diff --git a/tests/auto/gui/kernel/qguivariant/test/black2.png b/tests/auto/gui/kernel/qguivariant/test/black2.png
new file mode 100644
index 0000000000..6c94085ed5
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/black2.png
diff --git a/tests/auto/gui/kernel/qguivariant/test/test.pro b/tests/auto/gui/kernel/qguivariant/test/test.pro
index e3b4a350ca..c4123797d2 100644
--- a/tests/auto/gui/kernel/qguivariant/test/test.pro
+++ b/tests/auto/gui/kernel/qguivariant/test/test.pro
@@ -2,6 +2,7 @@ CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qguivariant
 SOURCES  += tst_qguivariant.cpp
+RESOURCES = tst_qguivariant.qrc
 INCLUDEPATH += $$PWD/../../../../other/qvariant_common
 QT += testlib
 RESOURCES += qguivariant.qrc
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 42570751fc..efc688f0b1 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -126,6 +126,8 @@ private slots:
     void implicitConstruction();
 
     void guiVariantAtExit();
+
+    void iconEquality();
 };
 
 void tst_QGuiVariant::constructor_invalid_data()
@@ -761,5 +763,32 @@ void tst_QGuiVariant::guiVariantAtExit()
     QVERIFY(true);
 }
 
+void tst_QGuiVariant::iconEquality()
+{
+    QIcon i;
+    QVariant a = i;
+    QVariant b = i;
+    QCOMPARE(a, b);
+
+    i = QIcon(":/black.png");
+    a = i;
+    QVERIFY(a != b);
+
+    b = a;
+    QCOMPARE(a, b);
+
+    i = QIcon(":/black2.png");
+    a = i;
+    QVERIFY(a != b);
+
+    b = i;
+    QCOMPARE(a, b);
+
+    // This is a "different" QIcon
+    // even if the contents are the same
+    b = QIcon(":/black2.png");
+    QVERIFY(a != b);
+}
+
 QTEST_MAIN(tst_QGuiVariant)
 #include "tst_qguivariant.moc"
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
new file mode 100644
index 0000000000..15cfde5788
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+<file>black.png</file>
+<file>black2.png</file>
+</qresource>
+</RCC>
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index d5ddf8fbec..53aef40df0 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -187,6 +187,9 @@ private slots:
     void htmlExportImportBlockCount();
 
     void QTBUG27354_spaceAndSoftSpace();
+    void baseUrl_data();
+    void baseUrl();
+
     void QTBUG28998_linkColor();
 
 private:
@@ -2947,6 +2950,53 @@ void tst_QTextDocument::QTBUG27354_spaceAndSoftSpace()
     }
 }
 
+class BaseDocument : public QTextDocument
+{
+public:
+    QUrl loadedResource() const { return resourceUrl; }
+
+    QVariant loadResource(int type, const QUrl &name)
+    {
+        resourceUrl = name;
+        return QTextDocument::loadResource(type, name);
+    }
+
+private:
+    QUrl resourceUrl;
+};
+
+void tst_QTextDocument::baseUrl_data()
+{
+    QTest::addColumn<QUrl>("base");
+    QTest::addColumn<QUrl>("resource");
+    QTest::addColumn<QUrl>("loaded");
+
+    QTest::newRow("1") << QUrl() << QUrl("images/logo.png") << QUrl("images/logo.png");
+    QTest::newRow("2") << QUrl("file:///path/to/content") << QUrl("images/logo.png") << QUrl("file:///path/to/images/logo.png");
+    QTest::newRow("3") << QUrl("file:///path/to/content/") << QUrl("images/logo.png") << QUrl("file:///path/to/content/images/logo.png");
+    QTest::newRow("4") << QUrl("file:///path/to/content/images") << QUrl("images/logo.png") << QUrl("file:///path/to/content/images/logo.png");
+    QTest::newRow("5") << QUrl("file:///path/to/content/images/") << QUrl("images/logo.png") << QUrl("file:///path/to/content/images/images/logo.png");
+    QTest::newRow("6") << QUrl("file:///path/to/content/images") << QUrl("../images/logo.png") << QUrl("file:///path/to/images/logo.png");
+    QTest::newRow("7") << QUrl("file:///path/to/content/images/") << QUrl("../images/logo.png") << QUrl("file:///path/to/content/images/logo.png");
+    QTest::newRow("8") << QUrl("file:///path/to/content/index.html") << QUrl("images/logo.png") << QUrl("file:///path/to/content/images/logo.png");
+}
+
+void tst_QTextDocument::baseUrl()
+{
+    QFETCH(QUrl, base);
+    QFETCH(QUrl, resource);
+    QFETCH(QUrl, loaded);
+
+    BaseDocument document;
+    QVERIFY(!document.baseUrl().isValid());
+    document.setBaseUrl(base);
+    QCOMPARE(document.baseUrl(), base);
+
+    document.setHtml(QString("<img src='%1'/>").arg(resource.toString()));
+    document.resource(QTextDocument::ImageResource, resource);
+    QCOMPARE(document.loadedResource(), loaded);
+}
+
 void tst_QTextDocument::QTBUG28998_linkColor()
 {
     QPalette pal;