aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
-rw-r--r--tests/auto/qml/qqmllanguage/qqmllanguage.pro2
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
index 942a511b7f..3b0518cfdf 100644
--- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro
+++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
@@ -12,7 +12,7 @@ SOURCES += ../../shared/testhttpserver.cpp
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private network testlib
+QT += core-private gui-private qml-private network testlib
include (../../shared/util.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 1ffaf8036c..b5c8edf5f3 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -842,7 +842,7 @@ void tst_qqmllanguage::bindJSValueToVar()
QCOMPARE(object->property("test15").userType(), (int)QVariant::SizeF);
QCOMPARE(object->property("test16").userType(), (int)QVariant::Vector3D);
QCOMPARE(object->property("test1Bound").userType(), (int)QVariant::Int);
- QCOMPARE(object->property("test20Bound").userType(), (int)QVariant::Int);
+ QCOMPARE(object->property("test20Bound").userType(), (int)QVariant::Double);
QCOMPARE(object->property("test1"), QVariant(5));
QCOMPARE(object->property("test2"), QVariant((double)1.7));
@@ -891,7 +891,7 @@ void tst_qqmllanguage::bindJSValueToVariant()
QCOMPARE(object->property("test15").userType(), (int)QVariant::SizeF);
QCOMPARE(object->property("test16").userType(), (int)QVariant::Vector3D);
QCOMPARE(object->property("test1Bound").userType(), (int)QVariant::Int);
- QCOMPARE(object->property("test20Bound").userType(), (int)QVariant::Int);
+ QCOMPARE(object->property("test20Bound").userType(), (int)QVariant::Double);
QCOMPARE(object->property("test1"), QVariant(5));
QCOMPARE(object->property("test2"), QVariant((double)1.7));
@@ -1072,7 +1072,6 @@ void tst_qqmllanguage::bindTypeToJSValue()
} {
MyQmlObject *object = root->findChild<MyQmlObject *>("urlProperty");
QJSValue value = object->qjsvalue();
- QVERIFY(value.isString());
QUrl encoded;
encoded.setEncodedUrl("main.qml?with%3cencoded%3edata", QUrl::TolerantMode);
QCOMPARE(value.toString(), component.url().resolved(encoded).toString());