diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-07-11 13:01:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 03:38:49 +0200 |
| commit | aa25ad8d5f476d6db59012a122833ebe677eaf69 (patch) | |
| tree | 37eb955dabc252304aefe821d03be5e3857f22c9 /tests/auto/quick/qquickstates | |
| parent | d64224041efe9febc683cf5ee7155a9cc88058d9 (diff) | |
Make QQmlScriptString opaque.
Allow for future optimization by encapsulating the
raw script data.
Change-Id: I1863103e8e6d74ede60593cabb240e16f2ae657e
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickstates')
| -rw-r--r-- | tests/auto/quick/qquickstates/tst_qquickstates.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp index 0a42ae5678..b8a3a49583 100644 --- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp +++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp @@ -702,8 +702,9 @@ void tst_qquickstates::anchorChanges() QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0)); QVERIFY(aChanges != 0); - QCOMPARE(aChanges->anchors()->left().script(), QLatin1String("undefined")); - QCOMPARE(aChanges->anchors()->right().script(), QLatin1String("container.right")); + QCOMPARE(aChanges->anchors()->left().isUndefinedLiteral(), true); + QVERIFY(!aChanges->anchors()->left().isEmpty()); + QVERIFY(!aChanges->anchors()->right().isEmpty()); rectPrivate->setState("right"); QCOMPARE(innerRect->x(), qreal(150)); @@ -765,8 +766,8 @@ void tst_qquickstates::anchorChanges3() QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0)); QVERIFY(aChanges != 0); - QCOMPARE(aChanges->anchors()->top().script(), QLatin1String("container.top")); - QCOMPARE(aChanges->anchors()->bottom().script(), QLatin1String("bottomGuideline.bottom")); + QVERIFY(!aChanges->anchors()->top().isEmpty()); + QVERIFY(!aChanges->anchors()->bottom().isEmpty()); rectPrivate->setState("reanchored"); QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect)); @@ -818,8 +819,8 @@ void tst_qquickstates::anchorChanges4() QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0)); QVERIFY(aChanges != 0); - QCOMPARE(aChanges->anchors()->horizontalCenter().script(), QLatin1String("bottomGuideline.horizontalCenter")); - QCOMPARE(aChanges->anchors()->verticalCenter().script(), QLatin1String("leftGuideline.verticalCenter")); + QVERIFY(!aChanges->anchors()->horizontalCenter().isEmpty()); + QVERIFY(!aChanges->anchors()->verticalCenter().isEmpty()); QQuickItemPrivate::get(rect)->setState("reanchored"); QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect)); @@ -856,7 +857,7 @@ void tst_qquickstates::anchorChanges5() QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0)); QVERIFY(aChanges != 0); - QCOMPARE(aChanges->anchors()->baseline().script(), QLatin1String("leftGuideline.baseline")); + QVERIFY(!aChanges->anchors()->baseline().isEmpty()); QQuickItemPrivate::get(rect)->setState("reanchored"); QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect)); |