diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:48:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:48:54 +0200 |
| commit | 800025fb70ace453275011c1ae5ce906e0fa3344 (patch) | |
| tree | 7f1ff56262b75beb3b0a1e94563c43fc59de742b /tests/auto/quick/qquickitem2 | |
| parent | 666f20523cd7be16d88d3c03252ed2fd6e4be0c4 (diff) | |
| parent | eb0f98499485487f9f75b6388f00c58b50aeff50 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0dd91626837276f5811e4830f4a4e9f89bf1e1bd
Diffstat (limited to 'tests/auto/quick/qquickitem2')
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 3298036f53..e7f0adb24d 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -2271,7 +2271,7 @@ void tst_QQuickItem::transforms() QFETCH(QByteArray, qml); QFETCH(QTransform, transform); QQmlComponent component(&engine); - component.setData("import QtQuick 2.4\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); + component.setData("import QtQuick 2.3\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(item->itemTransform(0,0), transform); |