summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-23 02:51:48 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-23 02:51:48 (GMT)
commit11faf8ea7dbff1d81b6e5fbe7c907e5b06be1aa1 (patch)
tree30e17698bd888cd1fd727abc71f84b77a40ad3c3
parenta24183cc1df3f13b7ec7b4005a36bb58bcfeedb7 (diff)
downloadQt-11faf8ea7dbff1d81b6e5fbe7c907e5b06be1aa1.zip
Qt-11faf8ea7dbff1d81b6e5fbe7c907e5b06be1aa1.tar.gz
Qt-11faf8ea7dbff1d81b6e5fbe7c907e5b06be1aa1.tar.bz2
Use .qml file extension in test
-rw-r--r--tests/auto/declarative/qmlbindengine/data/bindingLoop.qml (renamed from tests/auto/declarative/qmlbindengine/data/bindingLoop.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml (renamed from tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml (renamed from tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/deferredProperties.qml (renamed from tests/auto/declarative/qmlbindengine/data/deferredProperties.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/extensionObjects.qml (renamed from tests/auto/declarative/qmlbindengine/data/extensionObjects.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml (renamed from tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml (renamed from tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/methods.1.qml (renamed from tests/auto/declarative/qmlbindengine/data/methods.1.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/methods.2.qml (renamed from tests/auto/declarative/qmlbindengine/data/methods.2.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml (renamed from tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml (renamed from tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt)0
-rw-r--r--tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp22
12 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/declarative/qmlbindengine/data/bindingLoop.txt b/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml
index 8b22dd1..8b22dd1 100644
--- a/tests/auto/declarative/qmlbindengine/data/bindingLoop.txt
+++ b/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml
index 3147f63..3147f63 100644
--- a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml
index c89bb49..c89bb49 100644
--- a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/deferredProperties.txt b/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml
index 9dabafe..9dabafe 100644
--- a/tests/auto/declarative/qmlbindengine/data/deferredProperties.txt
+++ b/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/extensionObjects.txt b/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml
index a902312..a902312 100644
--- a/tests/auto/declarative/qmlbindengine/data/extensionObjects.txt
+++ b/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml
index ccb3a22..ccb3a22 100644
--- a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml
index 6c1fca6..6c1fca6 100644
--- a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt
+++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/methods.1.txt b/tests/auto/declarative/qmlbindengine/data/methods.1.qml
index 8ba300f..8ba300f 100644
--- a/tests/auto/declarative/qmlbindengine/data/methods.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/methods.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/methods.2.txt b/tests/auto/declarative/qmlbindengine/data/methods.2.qml
index 70911f7..70911f7 100644
--- a/tests/auto/declarative/qmlbindengine/data/methods.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/methods.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml
index fbd0914..fbd0914 100644
--- a/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml
index 8addcb9..8addcb9 100644
--- a/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
index 2f2bb43..c7d6a87 100644
--- a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
+++ b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
@@ -47,7 +47,7 @@ private:
void tst_qmlbindengine::idShortcutInvalidates()
{
{
- QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.txt"));
+ QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QVERIFY(object->objectProperty() != 0);
@@ -56,7 +56,7 @@ void tst_qmlbindengine::idShortcutInvalidates()
}
{
- QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.txt"));
+ QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QVERIFY(object->objectProperty() != 0);
@@ -68,13 +68,13 @@ void tst_qmlbindengine::idShortcutInvalidates()
void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
{
{
- QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.txt"));
+ QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->stringProperty(), QLatin1String("pass"));
}
{
- QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.txt"));
+ QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->stringProperty(), QLatin1String("pass"));
@@ -84,7 +84,7 @@ void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
void tst_qmlbindengine::signalAssignment()
{
{
- QmlComponent component(&engine, TEST_FILE("signalAssignment.1.txt"));
+ QmlComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->string(), QString());
@@ -93,7 +93,7 @@ void tst_qmlbindengine::signalAssignment()
}
{
- QmlComponent component(&engine, TEST_FILE("signalAssignment.2.txt"));
+ QmlComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->string(), QString());
@@ -105,7 +105,7 @@ void tst_qmlbindengine::signalAssignment()
void tst_qmlbindengine::methods()
{
{
- QmlComponent component(&engine, TEST_FILE("methods.1.txt"));
+ QmlComponent component(&engine, TEST_FILE("methods.1.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->methodCalled(), false);
@@ -116,7 +116,7 @@ void tst_qmlbindengine::methods()
}
{
- QmlComponent component(&engine, TEST_FILE("methods.2.txt"));
+ QmlComponent component(&engine, TEST_FILE("methods.2.qml"));
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->methodCalled(), false);
@@ -129,7 +129,7 @@ void tst_qmlbindengine::methods()
void tst_qmlbindengine::bindingLoop()
{
- QmlComponent component(&engine, TEST_FILE("bindingLoop.txt"));
+ QmlComponent component(&engine, TEST_FILE("bindingLoop.qml"));
QTest::ignoreMessage(QtWarningMsg, "QML MyQmlObject (unknown location): Binding loop detected for property \"stringProperty\" ");
QObject *object = component.create();
QVERIFY(object != 0);
@@ -337,7 +337,7 @@ void tst_qmlbindengine::objectPropertiesTriggerReeval()
void tst_qmlbindengine::deferredProperties()
{
- QmlComponent component(&engine, TEST_FILE("deferredProperties.txt"));
+ QmlComponent component(&engine, TEST_FILE("deferredProperties.qml"));
MyDeferredObject *object =
qobject_cast<MyDeferredObject *>(component.create());
QVERIFY(object != 0);
@@ -354,7 +354,7 @@ void tst_qmlbindengine::deferredProperties()
void tst_qmlbindengine::extensionObjects()
{
- QmlComponent component(&engine, TEST_FILE("extensionObjects.txt"));
+ QmlComponent component(&engine, TEST_FILE("extensionObjects.qml"));
MyExtendedObject *object =
qobject_cast<MyExtendedObject *>(component.create());
QVERIFY(object != 0);