Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ifb69f73ac805afe5e3c8708fa975b7d3c13a4e48

15 files changed, 230 insertions, 42 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index c535258c19..adf944c7e1 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -1024,11 +1024,14 @@ void tst_QJSEngine::builtinFunctionNames_data()
     QTest::newRow("Math.pow") << QString("Math.pow") << QString("pow");
     QTest::newRow("Math.random") << QString("Math.random") << QString("random");
     QTest::newRow("Math.round") << QString("Math.round") << QString("round");
+    QTest::newRow("Math.sign") << QString("Math.sign") << QString("sign");
     QTest::newRow("Math.sin") << QString("Math.sin") << QString("sin");
     QTest::newRow("Math.sqrt") << QString("Math.sqrt") << QString("sqrt");
     QTest::newRow("Math.tan") << QString("Math.tan") << QString("tan");
 
     QTest::newRow("Number") << QString("Number") << QString("Number");
+    QTest::newRow("Number.isFinite") << QString("Number.isFinite") << QString("isFinite");
+    QTest::newRow("Number.isNaN") << QString("Number.isNaN") << QString("isNaN");
     QTest::newRow("Number.prototype.toString") << QString("Number.prototype.toString") << QString("toString");
     QTest::newRow("Number.prototype.toLocaleString") << QString("Number.prototype.toLocaleString") << QString("toLocaleString");
     QTest::newRow("Number.prototype.valueOf") << QString("Number.prototype.valueOf") << QString("valueOf");
@@ -1920,6 +1923,7 @@ void tst_QJSEngine::jsNumberClass()
         QVERIFY(ctor.property("NaN").isNumber());
         QVERIFY(ctor.property("NEGATIVE_INFINITY").isNumber());
         QVERIFY(ctor.property("POSITIVE_INFINITY").isNumber());
+        QVERIFY(ctor.property("EPSILON").isNumber());
     }
     QCOMPARE(proto.toNumber(), qreal(0));
     QVERIFY(proto.property("constructor").strictlyEquals(ctor));
@@ -1958,6 +1962,50 @@ void tst_QJSEngine::jsNumberClass()
         QCOMPARE(ret.toNumber(), qreal(456));
     }
 
+    QVERIFY(ctor.property("isFinite").isCallable());
+    {
+        QJSValue ret = eng.evaluate("Number.isFinite()");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isFinite(NaN)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isFinite(Infinity)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isFinite(-Infinity)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isFinite(123)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), true);
+    }
+
+    QVERIFY(ctor.property("isNaN").isCallable());
+    {
+        QJSValue ret = eng.evaluate("Number.isNaN()");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isNaN(NaN)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), true);
+    }
+    {
+        QJSValue ret = eng.evaluate("Number.isNaN(123)");
+        QVERIFY(ret.isBool());
+        QCOMPARE(ret.toBool(), false);
+    }
+
     QVERIFY(proto.property("toString").isCallable());
     {
         QJSValue ret = eng.evaluate("new Number(123).toString()");
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt
deleted file mode 100644
index 32d2ed857e..0000000000
--- a/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:1:Composite Singleton Type SingletonType is not creatable.
diff --git a/tests/auto/qml/qqmllanguage/data/uncreatableTypeAsProperty.qml b/tests/auto/qml/qqmllanguage/data/uncreatableTypeAsProperty.qml
new file mode 100644
index 0000000000..8369ab1eea
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/uncreatableTypeAsProperty.qml
@@ -0,0 +1,6 @@
+import QtQml 2.0
+import Test 1.0
+
+QtObject {
+    property MyUncreateableBaseClass someProperty;
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index dd7410dfd3..1ac1661ea8 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -188,6 +188,8 @@ private slots:
     void subclassedUncreateableRevision_data();
     void subclassedUncreateableRevision();
 
+    void uncreatableTypesAsProperties();
+
     void propertyInit();
     void remoteLoadCrash();
     void signalWithDefaultArg();
@@ -3158,6 +3160,14 @@ void tst_qqmllanguage::subclassedUncreateableRevision()
     delete obj;
 }
 
+void tst_qqmllanguage::uncreatableTypesAsProperties()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("uncreatableTypeAsProperty.qml"));
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+}
+
 void tst_qqmllanguage::initTestCase()
 {
     QQmlDataTest::initTestCase();
@@ -3863,12 +3873,11 @@ void tst_qqmllanguage::compositeSingletonInstantiateError()
     VERIFY_ERRORS("singletonTest9.error.txt");
 }
 
-// Having a composite singleton type as dynamic property type fails
-// (like C++ singleton)
+// Having a composite singleton type as dynamic property type is allowed
 void tst_qqmllanguage::compositeSingletonDynamicPropertyError()
 {
     QQmlComponent component(&engine, testFile("singletonTest10.qml"));
-    VERIFY_ERRORS("singletonTest10.error.txt");
+    VERIFY_ERRORS(0);
 }
 
 // Having a composite singleton type as dynamic signal parameter succeeds
diff --git a/tests/auto/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro
index 186ef71e8d..71d91c107d 100644
--- a/tests/auto/qmldevtools/compile/compile.pro
+++ b/tests/auto/qmldevtools/compile/compile.pro
@@ -12,3 +12,4 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_compile.cpp
 
+load(qt_common)
diff --git a/tests/auto/quick/qquickborderimage/data/mesh.qml b/tests/auto/quick/qquickborderimage/data/mesh.qml
new file mode 100644
index 0000000000..203bf25867
--- /dev/null
+++ b/tests/auto/quick/qquickborderimage/data/mesh.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.8
+
+Item {
+    width: 300
+    height: 300
+    Image {
+        id: image
+        source: "colors.png"
+        visible: false
+    }
+    ShaderEffect {
+        anchors.fill: parent
+        property variant source: image
+        mesh: BorderImageMesh {
+            border.left: 30
+            border.right: 30
+            border.top: 30
+            border.bottom: 30
+            size: image.sourceSize
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickborderimage/data/nonmesh.qml b/tests/auto/quick/qquickborderimage/data/nonmesh.qml
new file mode 100644
index 0000000000..7a1830a942
--- /dev/null
+++ b/tests/auto/quick/qquickborderimage/data/nonmesh.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.8
+
+BorderImage {
+    width: 300
+    height: 300
+    source: "colors.png"
+    border.left: 30
+    border.right: 30
+    border.top: 30
+    border.bottom: 30
+}
diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro
index 3e16063559..ba6c01737a 100644
--- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro
+++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro
@@ -7,6 +7,7 @@ SOURCES += tst_qquickborderimage.cpp \
            ../../shared/testhttpserver.cpp
 
 include (../../shared/util.pri)
+include (../shared/util.pri)
 
 TESTDATA = data/*
 
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index c11ae1e8c9..e1435e739f 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -44,6 +44,7 @@
 
 #include "../../shared/testhttpserver.h"
 #include "../../shared/util.h"
+#include "../shared/visualtestutil.h"
 
 Q_DECLARE_METATYPE(QQuickImageBase::Status)
 
@@ -75,6 +76,7 @@ private slots:
     void statusChanges_data();
     void sourceSizeChanges();
     void progressAndStatusChanges();
+    void borderImageMesh();
 
 private:
     QQmlEngine engine;
@@ -575,6 +577,21 @@ void tst_qquickborderimage::progressAndStatusChanges()
     delete obj;
 }
 
+void tst_qquickborderimage::borderImageMesh()
+{
+    QQuickView *window = new QQuickView;
+
+    window->setSource(testFileUrl("nonmesh.qml"));
+    window->show();
+    QTest::qWaitForWindowExposed(window);
+    QImage nonmesh = window->grabWindow();
+
+    window->setSource(testFileUrl("mesh.qml"));
+    QImage mesh = window->grabWindow();
+
+    QVERIFY(QQuickVisualTestUtil::compareImages(mesh, nonmesh));
+}
+
 QTEST_MAIN(tst_qquickborderimage)
 
 #include "tst_qquickborderimage.moc"
diff --git a/tests/auto/quick/qquickwindow/data/changeVisibilityInCompleted.qml b/tests/auto/quick/qquickwindow/data/changeVisibilityInCompleted.qml
new file mode 100644
index 0000000000..48c4d1d69f
--- /dev/null
+++ b/tests/auto/quick/qquickwindow/data/changeVisibilityInCompleted.qml
@@ -0,0 +1,47 @@
+import QtQuick 2.0
+import QtQuick.Window 2.1
+
+Window {
+    width: 200
+    height: 200
+
+    property var winVisible: subwin1
+    property var winVisibility: subwin2
+
+    Rectangle {
+        anchors.fill: parent
+        color:"green"
+    }
+
+    Window {
+        id: subwin1
+        width: 200
+        height: 200
+
+        visible: false
+
+        Rectangle {
+            anchors.fill: parent
+            color:"red"
+        }
+        Component.onCompleted: {
+            subwin1.visible = true
+        }
+    }
+    Window {
+        id: subwin2
+        width: 200
+        height: 200
+
+        visible: true
+        visibility: Window.Maximized
+
+        Rectangle {
+            anchors.fill: parent
+            color:"blue"
+        }
+        Component.onCompleted: {
+            subwin2.visibility = Window.Windowed
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 0e4ad86260..ff996e5362 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -348,6 +348,7 @@ private slots:
     void crashWhenHoverItemDeleted();
 
     void unloadSubWindow();
+    void changeVisibilityInCompleted();
 
     void qobjectEventFilter_touch();
     void qobjectEventFilter_key();
@@ -1865,6 +1866,28 @@ void tst_qquickwindow::unloadSubWindow()
     QTRY_VERIFY(transient.isNull() || !transient->isVisible());
 }
 
+// QTBUG-52573
+void tst_qquickwindow::changeVisibilityInCompleted()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("changeVisibilityInCompleted.qml"));
+    QScopedPointer<QQuickWindow> window(qobject_cast<QQuickWindow *>(component.create()));
+    QVERIFY(!window.isNull());
+    window->setTitle(QTest::currentTestFunction());
+    window->show();
+    QTest::qWaitForWindowExposed(window.data());
+    QPointer<QQuickWindow> winVisible;
+    QTRY_VERIFY(winVisible = window->property("winVisible").value<QQuickWindow*>());
+    QPointer<QQuickWindow> winVisibility;
+    QTRY_VERIFY(winVisibility = window->property("winVisibility").value<QQuickWindow*>());
+    QTest::qWaitForWindowExposed(winVisible);
+    QTest::qWaitForWindowExposed(winVisibility);
+
+    QVERIFY(winVisible->isVisible());
+    QCOMPARE(winVisibility->visibility(), QWindow::Windowed);
+}
+
 // QTBUG-32004
 void tst_qquickwindow::qobjectEventFilter_touch()
 {
diff --git a/tests/auto/quick/scenegraph/scenegraph.pro b/tests/auto/quick/scenegraph/scenegraph.pro
index 320228bd08..40ff7750cc 100644
--- a/tests/auto/quick/scenegraph/scenegraph.pro
+++ b/tests/auto/quick/scenegraph/scenegraph.pro
@@ -3,6 +3,7 @@ TARGET = tst_scenegraph
 SOURCES += tst_scenegraph.cpp
 
 include (../../shared/util.pri)
+include (../shared/util.pri)
 
 macx:CONFIG -= app_bundle
 
diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
index 6f00d5f9f2..91c872a36a 100644
--- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp
+++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
@@ -44,6 +44,10 @@
 #include <private/qsgcontext_p.h>
 #include <private/qsgrenderloop_p.h>
 
+#include "../shared/visualtestutil.h"
+
+using namespace QQuickVisualTestUtil;
+
 class PerPixelRect : public QQuickItem
 {
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -194,44 +198,6 @@ bool containsSomethingOtherThanWhite(const QImage &image)
     return false;
 }
 
-// When running on native Nvidia graphics cards on linux, the
-// distance field glyph pixels have a measurable, but not visible
-// pixel error. Use a custom compare function to avoid
-//
-// This was GT-216 with the ubuntu "nvidia-319" driver package.
-// llvmpipe does not show the same issue.
-//
-bool compareImages(const QImage &ia, const QImage &ib)
-{
-    if (ia.size() != ib.size())
-        qDebug() << "images are of different size" << ia.size() << ib.size();
-    Q_ASSERT(ia.size() == ib.size());
-    Q_ASSERT(ia.format() == ib.format());
-
-    int w = ia.width();
-    int h = ia.height();
-    const int tolerance = 5;
-    for (int y=0; y<h; ++y) {
-        const uint *as= (const uint *) ia.constScanLine(y);
-        const uint *bs= (const uint *) ib.constScanLine(y);
-        for (int x=0; x<w; ++x) {
-            uint a = as[x];
-            uint b = bs[x];
-
-            // No tolerance for error in the alpha.
-            if ((a & 0xff000000) != (b & 0xff000000))
-                return false;
-            if (qAbs(qRed(a) - qRed(b)) > tolerance)
-                return false;
-            if (qAbs(qRed(a) - qRed(b)) > tolerance)
-                return false;
-            if (qAbs(qRed(a) - qRed(b)) > tolerance)
-                return false;
-        }
-    }
-    return true;
-}
-
 void tst_SceneGraph::manyWindows_data()
 {
     QTest::addColumn<QString>("file");
diff --git a/tests/auto/quick/shared/visualtestutil.cpp b/tests/auto/quick/shared/visualtestutil.cpp
index 3e18c83ee2..eabfe5368b 100644
--- a/tests/auto/quick/shared/visualtestutil.cpp
+++ b/tests/auto/quick/shared/visualtestutil.cpp
@@ -61,3 +61,38 @@ void QQuickVisualTestUtil::dumpTree(QQuickItem *parent, int depth)
     }
 }
 
+// A custom compare function to avoid issues such as:
+// When running on native Nvidia graphics cards on linux, the
+// distance field glyph pixels have a measurable, but not visible
+// pixel error. This was GT-216 with the ubuntu "nvidia-319" driver package.
+// llvmpipe does not show the same issue.
+bool QQuickVisualTestUtil::compareImages(const QImage &ia, const QImage &ib)
+{
+    if (ia.size() != ib.size())
+        qDebug() << "images are of different size" << ia.size() << ib.size();
+    Q_ASSERT(ia.size() == ib.size());
+    Q_ASSERT(ia.format() == ib.format());
+
+    int w = ia.width();
+    int h = ia.height();
+    const int tolerance = 5;
+    for (int y=0; y<h; ++y) {
+        const uint *as= (const uint *) ia.constScanLine(y);
+        const uint *bs= (const uint *) ib.constScanLine(y);
+        for (int x=0; x<w; ++x) {
+            uint a = as[x];
+            uint b = bs[x];
+
+            // No tolerance for error in the alpha.
+            if ((a & 0xff000000) != (b & 0xff000000))
+                return false;
+            if (qAbs(qRed(a) - qRed(b)) > tolerance)
+                return false;
+            if (qAbs(qRed(a) - qRed(b)) > tolerance)
+                return false;
+            if (qAbs(qRed(a) - qRed(b)) > tolerance)
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/tests/auto/quick/shared/visualtestutil.h b/tests/auto/quick/shared/visualtestutil.h
index 2b377a4bab..2daf86cd83 100644
--- a/tests/auto/quick/shared/visualtestutil.h
+++ b/tests/auto/quick/shared/visualtestutil.h
@@ -96,6 +96,8 @@ namespace QQuickVisualTestUtil
             items << qobject_cast<QQuickItem*>(findItem<T>(parent, objectName, indexes[i]));
         return items;
     }
+
+    bool compareImages(const QImage &ia, const QImage &ib);
 }
 
 #define QQUICK_VERIFY_POLISH(item) \