Merge remote-tracking branch 'origin/api_changes'

Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167

12 files changed, 473 insertions, 20 deletions

diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 61675d980d..4dd7688f6a 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -69,7 +69,15 @@ tst_qquickapplication::tst_qquickapplication()
 void tst_qquickapplication::active()
 {
     QQmlComponent component(&engine);
-    component.setData("import QtQuick 2.0; Item { property bool active: Qt.application.active }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 2.0; "
+                      "Item { "
+                      "    property bool active: Qt.application.active; "
+                      "    property bool active2: false; "
+                      "    Connections { "
+                      "        target: Qt.application; "
+                      "        onActiveChanged: active2 = Qt.application.active; "
+                      "    } "
+                      "}", QUrl::fromLocalFile(""));
     QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
     QVERIFY(item);
     QQuickView view;
@@ -77,6 +85,7 @@ void tst_qquickapplication::active()
 
     // not active
     QVERIFY(!item->property("active").toBool());
+    QVERIFY(!item->property("active2").toBool());
     QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0);
 
     // active
@@ -86,6 +95,7 @@ void tst_qquickapplication::active()
     QEXPECT_FAIL("", "QTBUG-21573", Abort);
     QTRY_COMPARE(view.status(), QQuickView::Ready);
     QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0);
+    QCOMPARE(item->property("active2").toBool(), QGuiApplication::activeWindow() != 0);
 
 #if 0
     // QGuiApplication has no equivalent of setActiveWindow(0). QTBUG-21573
@@ -128,6 +138,9 @@ void tst_qquickapplication::layoutDirection()
 
 void tst_qquickapplication::inputPanel()
 {
+    const QLatin1String expected("Qt.application.inputPanel is deprecated, use Qt.inputMethod instead ");
+    QTest::ignoreMessage(QtWarningMsg, expected.data());
+
     QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0; Item { property variant inputPanel: Qt.application.inputPanel }", QUrl::fromLocalFile(""));
     QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
diff --git a/tests/auto/quick/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/quick/qquickcanvas/tst_qquickcanvas.cpp
index 402e81e640..ca2165d711 100644
--- a/tests/auto/quick/qquickcanvas/tst_qquickcanvas.cpp
+++ b/tests/auto/quick/qquickcanvas/tst_qquickcanvas.cpp
@@ -266,7 +266,7 @@ void tst_qquickcanvas::touchEvent_basic()
 
     QQuickCanvas *canvas = new QQuickCanvas;
     canvas->resize(250, 250);
-    canvas->move(100, 100);
+    canvas->setPos(100, 100);
     canvas->show();
 
     TestTouchItem *bottomItem = new TestTouchItem(canvas->rootItem());
@@ -387,7 +387,7 @@ void tst_qquickcanvas::touchEvent_propagation()
 
     QQuickCanvas *canvas = new QQuickCanvas;
     canvas->resize(250, 250);
-    canvas->move(100, 100);
+    canvas->setPos(100, 100);
     canvas->show();
 
     TestTouchItem *bottomItem = new TestTouchItem(canvas->rootItem());
@@ -515,7 +515,7 @@ void tst_qquickcanvas::touchEvent_cancel()
 
     QQuickCanvas *canvas = new QQuickCanvas;
     canvas->resize(250, 250);
-    canvas->move(100, 100);
+    canvas->setPos(100, 100);
     canvas->show();
 
     TestTouchItem *item = new TestTouchItem(canvas->rootItem());
@@ -561,7 +561,7 @@ void tst_qquickcanvas::mouseFiltering()
 
     QQuickCanvas *canvas = new QQuickCanvas;
     canvas->resize(250, 250);
-    canvas->move(100, 100);
+    canvas->setPos(100, 100);
     canvas->show();
 
     TestTouchItem *bottomItem = new TestTouchItem(canvas->rootItem());
@@ -618,7 +618,7 @@ void tst_qquickcanvas::clearColor()
     //### Can we examine rendering to make sure it is really blue?
     QQuickCanvas *canvas = new QQuickCanvas;
     canvas->resize(250, 250);
-    canvas->move(100, 100);
+    canvas->setPos(100, 100);
     canvas->setClearColor(Qt::blue);
     canvas->show();
     QTest::qWaitForWindowShown(canvas);
diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro
index ad0097df08..e0d309da33 100644
--- a/tests/auto/quick/qquickimage/qquickimage.pro
+++ b/tests/auto/quick/qquickimage/qquickimage.pro
@@ -13,3 +13,4 @@ TESTDATA = data/*
 
 CONFIG += parallel_test
 QT += core-private gui-private qml-private quick-private network testlib
+CONFIG += insignificant_test
diff --git a/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro b/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro
new file mode 100644
index 0000000000..269f06a046
--- /dev/null
+++ b/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro
@@ -0,0 +1,9 @@
+CONFIG += testcase
+TARGET = tst_qquickimageprovider
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qquickimageprovider.cpp
+
+CONFIG += parallel_test
+
+QT += core-private gui-private qml-private quick-private network testlib
diff --git a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
new file mode 100644
index 0000000000..7f9a0efb33
--- /dev/null
+++ b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
@@ -0,0 +1,424 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <QtQml/qqmlengine.h>
+#include <QtQuick/qquickimageprovider.h>
+#include <private/qquickimage_p.h>
+#include <QImageReader>
+#include <QWaitCondition>
+
+Q_DECLARE_METATYPE(QQuickImageProvider*);
+
+class tst_qquickimageprovider : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qquickimageprovider()
+    {
+    }
+
+private slots:
+    void requestImage_sync_data();
+    void requestImage_sync();
+    void requestImage_async_data();
+    void requestImage_async();
+
+    void requestPixmap_sync_data();
+    void requestPixmap_sync();
+    void requestPixmap_async();
+
+    void removeProvider_data();
+    void removeProvider();
+
+    void threadTest();
+
+private:
+    QString newImageFileName() const;
+    void fillRequestTestsData(const QString &id);
+    void runTest(bool async, QQuickImageProvider *provider);
+};
+
+
+class TestQImageProvider : public QQuickImageProvider
+{
+public:
+    TestQImageProvider(bool *deleteWatch = 0)
+        : QQuickImageProvider(Image), deleteWatch(deleteWatch)
+    {
+    }
+
+    ~TestQImageProvider()
+    {
+        if (deleteWatch)
+            *deleteWatch = true;
+    }
+
+    QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize)
+    {
+        lastImageId = id;
+
+        if (id == QLatin1String("no-such-file.png"))
+            return QImage();
+
+        int width = 100; 
+        int height = 100;
+        QImage image(width, height, QImage::Format_RGB32);
+        if (size) 
+            *size = QSize(width, height);
+        if (requestedSize.isValid())
+            image = image.scaled(requestedSize);
+        return image;
+    }
+
+    bool *deleteWatch;
+    QString lastImageId;
+};
+Q_DECLARE_METATYPE(TestQImageProvider*);
+
+
+class TestQPixmapProvider : public QQuickImageProvider
+{
+public:
+    TestQPixmapProvider(bool *deleteWatch = 0)
+        : QQuickImageProvider(Pixmap), deleteWatch(deleteWatch)
+    {
+    }
+
+    ~TestQPixmapProvider()
+    {
+        if (deleteWatch)
+            *deleteWatch = true;
+    }
+
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize)
+    {
+        lastImageId = id;
+
+        if (id == QLatin1String("no-such-file.png"))
+            return QPixmap();
+
+        int width = 100; 
+        int height = 100;
+        QPixmap image(width, height);
+        if (size) 
+            *size = QSize(width, height);
+        if (requestedSize.isValid())
+            image = image.scaled(requestedSize);
+        return image;
+    }
+
+    bool *deleteWatch;
+    QString lastImageId;
+};
+Q_DECLARE_METATYPE(TestQPixmapProvider*);
+
+
+QString tst_qquickimageprovider::newImageFileName() const
+{
+    // need to generate new filenames each time or else images are loaded
+    // from cache and we won't get loading status changes when testing 
+    // async loading
+    static int count = 0;
+    return QString("image://test/image-%1.png").arg(count++);
+}
+
+void tst_qquickimageprovider::fillRequestTestsData(const QString &id)
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<QString>("imageId");
+    QTest::addColumn<QString>("properties");
+    QTest::addColumn<QSize>("size");
+    QTest::addColumn<QString>("error");
+
+    QString fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " simple test"))
+            << "image://test/" + fileName << fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " simple test with capitalization"))//As it's a URL, should make no difference
+            << "image://Test/" + fileName << fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " url with no id"))
+        << "image://test/" + fileName << "" + fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " url with path"))
+        << "image://test/test/path" + fileName << "test/path" + fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " url with fragment"))
+        << "image://test/faq.html?#question13" + fileName << "faq.html?#question13" + fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " url with query"))
+        << "image://test/cgi-bin/drawgraph.cgi?type=pie&color=green" + fileName << "cgi-bin/drawgraph.cgi?type=pie&color=green" + fileName
+        << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " scaled image"))
+            << "image://test/" + fileName << fileName << "sourceSize: \"80x30\"" << QSize(80,30) << "";
+
+    QTest::newRow(QTest::toString(id + " missing"))
+        << "image://test/no-such-file.png" << "no-such-file.png" << "" << QSize(100,100)
+        << "file::2:1: QML Image: Failed to get image from provider: image://test/no-such-file.png";
+
+    QTest::newRow(QTest::toString(id + " unknown provider"))
+        << "image://bogus/exists.png" << "" << "" << QSize()
+        << "file::2:1: QML Image: Invalid image provider: image://bogus/exists.png";
+}
+
+void tst_qquickimageprovider::runTest(bool async, QQuickImageProvider *provider)
+{
+    QFETCH(QString, source);
+    QFETCH(QString, imageId);
+    QFETCH(QString, properties);
+    QFETCH(QSize, size);
+    QFETCH(QString, error);
+
+    if (!error.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    QQmlEngine engine;
+
+    engine.addImageProvider("test", provider);
+    QVERIFY(engine.imageProvider("test") != 0);
+
+    QString componentStr = "import QtQuick 2.0\nImage { source: \"" + source + "\"; " 
+            + (async ? "asynchronous: true; " : "")
+            + properties + " }";
+    QQmlComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    if (async) 
+        QTRY_VERIFY(obj->status() == QQuickImage::Loading);
+
+    QCOMPARE(obj->source(), QUrl(source));
+
+    if (error.isEmpty()) {
+        if (async)
+            QTRY_VERIFY(obj->status() == QQuickImage::Ready);
+        else
+            QVERIFY(obj->status() == QQuickImage::Ready);
+        if (QByteArray(QTest::currentDataTag()).startsWith("qimage"))
+            QCOMPARE(static_cast<TestQImageProvider*>(provider)->lastImageId, imageId);
+        else
+            QCOMPARE(static_cast<TestQPixmapProvider*>(provider)->lastImageId, imageId);
+
+        QCOMPARE(obj->width(), qreal(size.width()));
+        QCOMPARE(obj->height(), qreal(size.height()));
+        QCOMPARE(obj->fillMode(), QQuickImage::Stretch);
+        QCOMPARE(obj->progress(), 1.0);
+    } else {
+        if (async)
+            QTRY_VERIFY(obj->status() == QQuickImage::Error);
+        else
+            QVERIFY(obj->status() == QQuickImage::Error);
+    }
+
+    delete obj;
+}
+
+void tst_qquickimageprovider::requestImage_sync_data()
+{
+    fillRequestTestsData("qimage|sync");
+}
+
+void tst_qquickimageprovider::requestImage_sync()
+{
+    bool deleteWatch = false;
+    runTest(false, new TestQImageProvider(&deleteWatch));
+    QVERIFY(deleteWatch);
+}
+
+void tst_qquickimageprovider::requestImage_async_data()
+{
+    fillRequestTestsData("qimage|async");
+}
+
+void tst_qquickimageprovider::requestImage_async()
+{
+    bool deleteWatch = false;
+    runTest(true, new TestQImageProvider(&deleteWatch));
+    QVERIFY(deleteWatch);
+}
+
+void tst_qquickimageprovider::requestPixmap_sync_data()
+{
+    fillRequestTestsData("qpixmap");
+}
+
+void tst_qquickimageprovider::requestPixmap_sync()
+{
+    bool deleteWatch = false;
+    runTest(false, new TestQPixmapProvider(&deleteWatch));
+    QVERIFY(deleteWatch);
+}
+
+void tst_qquickimageprovider::requestPixmap_async()
+{
+    QQmlEngine engine;
+    QQuickImageProvider *provider = new TestQPixmapProvider();
+
+    engine.addImageProvider("test", provider);
+    QVERIFY(engine.imageProvider("test") != 0);
+
+    // pixmaps are loaded synchronously regardless of 'asynchronous' value
+    QString componentStr = "import QtQuick 2.0\nImage { asynchronous: true; source: \"image://test/pixmap-async-test.png\" }";
+    QQmlComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    delete obj;
+}
+
+void tst_qquickimageprovider::removeProvider_data()
+{
+    QTest::addColumn<QQuickImageProvider*>("provider");
+
+    QTest::newRow("qimage") << static_cast<QQuickImageProvider*>(new TestQImageProvider);
+    QTest::newRow("qpixmap") << static_cast<QQuickImageProvider*>(new TestQPixmapProvider);
+}
+
+void tst_qquickimageprovider::removeProvider()
+{
+    QFETCH(QQuickImageProvider*, provider);
+
+    QQmlEngine engine;
+
+    engine.addImageProvider("test", provider);
+    QVERIFY(engine.imageProvider("test") != 0);
+
+    // add provider, confirm it works
+    QString componentStr = "import QtQuick 2.0\nImage { source: \"" + newImageFileName() + "\" }";
+    QQmlComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->status(), QQuickImage::Ready);
+
+    // remove the provider and confirm
+    QString fileName = newImageFileName();
+    QString error("file::2:1: QML Image: Invalid image provider: " + fileName);
+    QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    engine.removeImageProvider("test");
+
+    obj->setSource(QUrl(fileName));
+    QCOMPARE(obj->status(), QQuickImage::Error);
+
+    delete obj;
+}
+
+class TestThreadProvider : public QQuickImageProvider
+{
+    public:
+        TestThreadProvider() : QQuickImageProvider(Image), ok(false) {}
+
+        ~TestThreadProvider() {}
+
+        QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize)
+        {
+            mutex.lock();
+            if (!ok)
+                cond.wait(&mutex);
+            mutex.unlock();
+            QVector<int> v;
+            for (int i = 0; i < 10000; i++)
+                v.prepend(i); //do some computation
+            QImage image(50,50, QImage::Format_RGB32);
+            image.fill(QColor(id).rgb());
+            if (size)
+                *size = image.size();
+            if (requestedSize.isValid())
+                image = image.scaled(requestedSize);
+            return image;
+        }
+
+        QWaitCondition cond;
+        QMutex mutex;
+        bool ok;
+};
+
+
+void tst_qquickimageprovider::threadTest()
+{
+    QQmlEngine engine;
+
+    TestThreadProvider *provider = new TestThreadProvider;
+
+    engine.addImageProvider("test_thread", provider);
+    QVERIFY(engine.imageProvider("test_thread") != 0);
+
+    QString componentStr = "import QtQuick 2.0\nItem { \n"
+            "Image { source: \"image://test_thread/blue\";  asynchronous: true; }\n"
+            "Image { source: \"image://test_thread/red\";  asynchronous: true; }\n"
+            "Image { source: \"image://test_thread/green\";  asynchronous: true; }\n"
+            "Image { source: \"image://test_thread/yellow\";  asynchronous: true; }\n"
+            " }";
+    QQmlComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QObject *obj = component.create();
+    //MUST not deadlock
+    QVERIFY(obj != 0);
+    QList<QQuickImage *> images = obj->findChildren<QQuickImage *>();
+    QCOMPARE(images.count(), 4);
+    QTest::qWait(100);
+    foreach (QQuickImage *img, images) {
+        QCOMPARE(img->status(), QQuickImage::Loading);
+    }
+    provider->ok = true;
+    provider->cond.wakeAll();
+    QTest::qWait(250);
+    foreach (QQuickImage *img, images) {
+        QTRY_VERIFY(img->status() == QQuickImage::Ready);
+    }
+}
+
+
+QTEST_MAIN(tst_qquickimageprovider)
+
+#include "tst_qquickimageprovider.moc"
diff --git a/tests/auto/quick/qquickloader/data/initialPropertyValues.binding.qml b/tests/auto/quick/qquickloader/data/initialPropertyValues.binding.qml
index e0df50a74a..2ee60b0b50 100644
--- a/tests/auto/quick/qquickloader/data/initialPropertyValues.binding.qml
+++ b/tests/auto/quick/qquickloader/data/initialPropertyValues.binding.qml
@@ -16,6 +16,6 @@ Item {
     }
 
     Component.onCompleted: {
-        loader.setSource("InitialPropertyValuesComponent.qml", {"canary": (function() { return root.bindable })});
+        loader.setSource("InitialPropertyValuesComponent.qml", {"canary": Qt.binding(function() { return root.bindable })});
     }
 }
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
index 855322e376..8d2eb66e08 100644
--- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
+++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
@@ -42,7 +42,7 @@
 #include <QtTest/QtTest>
 #include <QtQuick/private/qquickpixmapcache_p.h>
 #include <QtQml/qqmlengine.h>
-#include <QtQml/qqmlimageprovider.h>
+#include <QtQuick/qquickimageprovider.h>
 #include <QNetworkReply>
 #include "../../shared/util.h"
 #include "testhttpserver.h"
@@ -335,11 +335,11 @@ void tst_qquickpixmapcache::cancelcrash()
     }
 }
 
-class MyPixmapProvider : public QQmlImageProvider
+class MyPixmapProvider : public QQuickImageProvider
 {
 public:
     MyPixmapProvider()
-    : QQmlImageProvider(Pixmap) {}
+    : QQuickImageProvider(Pixmap) {}
 
     virtual QPixmap requestPixmap(const QString &d, QSize *, const QSize &) {
         Q_UNUSED(d)
diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
index dbbfae0ebf..e4fce55548 100644
--- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro
+++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase
+CONFIG += insignificant_test
 TARGET = tst_qquickpositioners
 SOURCES += tst_qquickpositioners.cpp
 
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
index ae2bdc7fae..6ceacdfaf0 100644
--- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
+++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
@@ -1875,11 +1875,15 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
 QQuickView *tst_qquickpositioners::createView(const QString &filename, bool wait)
 {
     QQuickView *canvas = new QQuickView(0);
+    qDebug() << "1";
 
     canvas->setSource(QUrl::fromLocalFile(filename));
+    qDebug() << "2";
     canvas->show();
+    qDebug() << "3";
     if (wait)
         QTest::qWaitForWindowShown(canvas); //It may not relayout until the next frame, so it needs to be drawn
+    qDebug() << "4";
 
     return canvas;
 }
diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
index fc8194f6ca..7fd8fc4498 100644
--- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp
+++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
@@ -245,7 +245,7 @@ void tst_qquickstates::basicChanges()
 
         QMetaProperty prop = rect->metaObject()->property(rect->metaObject()->indexOfProperty("propertyWithNotify"));
         QVERIFY(prop.hasNotifySignal());
-        QString notifySignal = QByteArray(prop.notifySignal().signature());
+        QString notifySignal = prop.notifySignal().methodSignature();
         QVERIFY(!notifySignal.startsWith("propertyWithNotifyChanged("));
 
         QCOMPARE(rect->color(), QColor(Qt::red));
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 7ef232b4d9..a31b30dc60 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -45,7 +45,7 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <private/qquicktext_p_p.h>
-#include <private/qqmlvaluetype_p.h>
+#include <private/qquickvaluetypes_p.h>
 #include <QFontMetrics>
 #include <qmath.h>
 #include <QtQuick/QQuickView>
@@ -93,7 +93,7 @@ private slots:
     void color();
     void smooth();
 
-    // QQmlFontValueType
+    // QQuickFontValueType
     void weight();
     void underline();
     void overline();
@@ -1126,7 +1126,7 @@ void tst_qquicktext::weight()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QQmlFontValueType::Normal);
+        QCOMPARE((int)textObject->font().weight(), (int)QQuickFontValueType::Normal);
 
         delete textObject;
     }
@@ -1137,7 +1137,7 @@ void tst_qquicktext::weight()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QQmlFontValueType::Bold);
+        QCOMPARE((int)textObject->font().weight(), (int)QQuickFontValueType::Bold);
 
         delete textObject;
     }
@@ -1230,7 +1230,7 @@ void tst_qquicktext::capitalization()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QQmlFontValueType::MixedCase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::MixedCase);
 
         delete textObject;
     }
@@ -1241,7 +1241,7 @@ void tst_qquicktext::capitalization()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QQmlFontValueType::AllUppercase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::AllUppercase);
 
         delete textObject;
     }
@@ -1252,7 +1252,7 @@ void tst_qquicktext::capitalization()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QQmlFontValueType::AllLowercase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::AllLowercase);
 
         delete textObject;
     }
@@ -1263,7 +1263,7 @@ void tst_qquicktext::capitalization()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QQmlFontValueType::SmallCaps);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::SmallCaps);
 
         delete textObject;
     }
@@ -1274,7 +1274,7 @@ void tst_qquicktext::capitalization()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QQmlFontValueType::Capitalize);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::Capitalize);
 
         delete textObject;
     }
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 15713ac6ae..b018fbf14a 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -16,6 +16,7 @@ PRIVATETESTS += \
     qquickapplication \
     qquickbehaviors \
     qquickfontloader \
+    qquickimageprovider \
     qquickpath \
     qquicksmoothedanimation \
     qquickspringanimation \