diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:56 +0200 |
commit | 1c1bb3bc4ae3907d9d6d2417b56d90da3c70e4b7 (patch) | |
tree | ea7c3a0dbf98786edf0a2be0f82381e0f25bac61 /tests | |
parent | 7ccfa59664b8bdb24c06025d3ffc5c4da7f0bb1e (diff) | |
parent | b1ccb1f8c30d601c55145b65add3846fe5f9bb32 (diff) |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I4020a1b3c59dea18faf7cbcbb78b90fcfc3680f0
Diffstat (limited to 'tests')
6 files changed, 18 insertions, 10 deletions
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp index 68279413e0..bddece6452 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { - bool block = false; + QQmlDebuggingEnabler::StartMode block = QQmlDebuggingEnabler::DoNotWaitForClient; int portFrom = 0; int portTo = 0; @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) arguments.removeFirst(); if (arguments.size() && arguments.first() == QLatin1String("-block")) { - block = true; + block = QQmlDebuggingEnabler::WaitForClient; arguments.removeFirst(); } diff --git a/tests/auto/qml/qqmlvaluetypes/data/rect_compare.qml b/tests/auto/qml/qqmlvaluetypes/data/rect_compare.qml index c511c2dfc4..104e7ba1e9 100644 --- a/tests/auto/qml/qqmlvaluetypes/data/rect_compare.qml +++ b/tests/auto/qml/qqmlvaluetypes/data/rect_compare.qml @@ -1,10 +1,6 @@ import Test 1.0 MyTypeObject { - property int r_x: rect.x - property int r_y: rect.y - property int r_width: rect.width - property int r_height: rect.height property variant copy: rect property string tostring: rect.toString() diff --git a/tests/auto/qml/qqmlvaluetypes/data/rect_read.qml b/tests/auto/qml/qqmlvaluetypes/data/rect_read.qml index c3b37a7099..da6deddd75 100644 --- a/tests/auto/qml/qqmlvaluetypes/data/rect_read.qml +++ b/tests/auto/qml/qqmlvaluetypes/data/rect_read.qml @@ -5,6 +5,10 @@ MyTypeObject { property int r_y: rect.y property int r_width: rect.width property int r_height: rect.height + property int r_left: rect.left + property int r_right: rect.right + property int r_top: rect.top + property int r_bottom: rect.bottom property variant copy: rect } diff --git a/tests/auto/qml/qqmlvaluetypes/data/rectf_compare.qml b/tests/auto/qml/qqmlvaluetypes/data/rectf_compare.qml index 6ac4049558..eb61755bcf 100644 --- a/tests/auto/qml/qqmlvaluetypes/data/rectf_compare.qml +++ b/tests/auto/qml/qqmlvaluetypes/data/rectf_compare.qml @@ -1,10 +1,6 @@ import Test 1.0 MyTypeObject { - property real r_x: rectf.x - property real r_y: rectf.y - property real r_width: rectf.width - property real r_height: rectf.height property variant copy: rectf property string tostring: rectf.toString() diff --git a/tests/auto/qml/qqmlvaluetypes/data/rectf_read.qml b/tests/auto/qml/qqmlvaluetypes/data/rectf_read.qml index 6ff3ce30bf..878868254d 100644 --- a/tests/auto/qml/qqmlvaluetypes/data/rectf_read.qml +++ b/tests/auto/qml/qqmlvaluetypes/data/rectf_read.qml @@ -5,6 +5,10 @@ MyTypeObject { property real r_y: rectf.y property real r_width: rectf.width property real r_height: rectf.height + property real r_left: rectf.left + property real r_right: rectf.right + property real r_top: rectf.top + property real r_bottom: rectf.bottom property variant copy: rectf } diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp index 2892e746da..578004b0a1 100644 --- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp +++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp @@ -371,6 +371,10 @@ void tst_qqmlvaluetypes::rect() QCOMPARE(object->property("r_y").toInt(), 3); QCOMPARE(object->property("r_width").toInt(), 109); QCOMPARE(object->property("r_height").toInt(), 102); + QCOMPARE(object->property("r_left").toInt(), 2); + QCOMPARE(object->property("r_right").toInt(), 110); + QCOMPARE(object->property("r_top").toInt(), 3); + QCOMPARE(object->property("r_bottom").toInt(), 104); QCOMPARE(object->property("copy"), QVariant(QRect(2, 3, 109, 102))); delete object; @@ -418,6 +422,10 @@ void tst_qqmlvaluetypes::rectf() QCOMPARE(float(object->property("r_y").toDouble()), float(99.2)); QCOMPARE(float(object->property("r_width").toDouble()), float(88.1)); QCOMPARE(float(object->property("r_height").toDouble()), float(77.6)); + QCOMPARE(float(object->property("r_left").toDouble()), float(103.8)); + QCOMPARE(float(object->property("r_right").toDouble()), float(191.9)); + QCOMPARE(float(object->property("r_top").toDouble()), float(99.2)); + QCOMPARE(float(object->property("r_bottom").toDouble()), float(176.8)); QCOMPARE(object->property("copy"), QVariant(QRectF(103.8, 99.2, 88.1, 77.6))); delete object; |