summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-09-29 02:12:22 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-09-29 02:12:22 (GMT)
commit49452ad6b22e080b1dfdfde38c21c48bb910a1ae (patch)
tree3afdab3cad225f8f223e9f46bb2fc99cbabcd4ab /tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
parent4fcf055f66cc23c9e60a7add489e394420e71914 (diff)
downloadQt-49452ad6b22e080b1dfdfde38c21c48bb910a1ae.zip
Qt-49452ad6b22e080b1dfdfde38c21c48bb910a1ae.tar.gz
Qt-49452ad6b22e080b1dfdfde38c21c48bb910a1ae.tar.bz2
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Task-number: QTBUG-13799 Reviewed-by: Martin Jones
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 37e074b..ca7668d 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1385,12 +1385,12 @@ void tst_qdeclarativelanguage::importsLocal_data()
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("local import second")
- << "import Qt 4.7\nimport \"subdir\"\n"
+ << "import QtQuick 1.0\nimport \"subdir\"\n"
"Test {}"
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("local import subsubdir")
- << "import Qt 4.7\nimport \"subdir/subsubdir\"\n"
+ << "import QtQuick 1.0\nimport \"subdir/subsubdir\"\n"
"SubTest {}"
<< "QDeclarativeRectangle"
<< "";
@@ -1604,24 +1604,24 @@ void tst_qdeclarativelanguage::importsOrder_data()
QTest::newRow("installed import versus builtin 1") <<
"import com.nokia.installedtest 1.5\n"
- "import Qt 4.7\n"
+ "import QtQuick 1.0\n"
"Rectangle {}"
<< (!qmlCheckTypes()?"QDeclarativeRectangle":"")
<< (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/com/nokia/installedtest");
QTest::newRow("installed import versus builtin 2") <<
- "import Qt 4.7\n"
+ "import QtQuick 1.0\n"
"import com.nokia.installedtest 1.5\n"
"Rectangle {}"
<< (!qmlCheckTypes()?"QDeclarativeText":"")
<< (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest and in Qt");
QTest::newRow("namespaces cannot be overridden by types 1") <<
- "import Qt 4.7 as Rectangle\n"
+ "import QtQuick 1.0 as Rectangle\n"
"import com.nokia.installedtest 1.5\n"
"Rectangle {}"
<< ""
<< "Namespace Rectangle cannot be used as a type";
QTest::newRow("namespaces cannot be overridden by types 2") <<
- "import Qt 4.7 as Rectangle\n"
+ "import QtQuick 1.0 as Rectangle\n"
"import com.nokia.installedtest 1.5\n"
"Rectangle.Image {}"
<< "QDeclarativeImage"
@@ -1676,7 +1676,7 @@ void tst_qdeclarativelanguage::qmlAttachedPropertiesObjectMethod()
void tst_qdeclarativelanguage::crash1()
{
QDeclarativeComponent component(&engine);
- component.setData("import Qt 4.7\nComponent {}", QUrl());
+ component.setData("import QtQuick 1.0\nComponent {}", QUrl());
}
void tst_qdeclarativelanguage::crash2()