diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
commit | dcc5c7ea047513ceb6fc75aac526b17ad6629d4c (patch) | |
tree | eb35c11d8ed04c467a1bfee1fe6da06f93fe686d /tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | |
parent | 94aa8a639de93861cfafef2e195616cb8ee52093 (diff) | |
download | Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.zip Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.gz Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.bz2 |
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
Diffstat (limited to 'tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index 6b28c53..e9dad6b 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -436,7 +436,7 @@ void tst_QDeclarativeItem::keyNavigation() void tst_QDeclarativeItem::smooth() { QDeclarativeComponent component(&engine); - component.setData("import Qt 4.7; Item { smooth: false; }", QUrl::fromLocalFile("")); + component.setData("import QtQuick 1.0; Item { smooth: false; }", QUrl::fromLocalFile("")); QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QSignalSpy spy(item, SIGNAL(smoothChanged(bool))); @@ -465,7 +465,7 @@ void tst_QDeclarativeItem::smooth() void tst_QDeclarativeItem::clip() { QDeclarativeComponent component(&engine); - component.setData("import Qt 4.7\nItem { clip: false\n }", QUrl::fromLocalFile("")); + component.setData("import QtQuick 1.0\nItem { clip: false\n }", QUrl::fromLocalFile("")); QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QSignalSpy spy(item, SIGNAL(clipChanged(bool))); @@ -572,7 +572,7 @@ void tst_QDeclarativeItem::transforms() QFETCH(QByteArray, qml); QFETCH(QMatrix, matrix); QDeclarativeComponent component(&engine); - component.setData("import Qt 4.7\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); + component.setData("import QtQuick 1.0\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); QCOMPARE(item->sceneMatrix(), matrix); |