summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-10 07:34:31 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-10 07:34:31 (GMT)
commita3627a496c3b7c6c007fe01cabcba65bc073f0a7 (patch)
tree2c2bc4db3ce82308d5657321effaf29f3c07e211 /tests/auto/declarative
parentbdfccf48dc66a49a8adc3a160d6a873bf2b48adf (diff)
downloadQt-a3627a496c3b7c6c007fe01cabcba65bc073f0a7.zip
Qt-a3627a496c3b7c6c007fe01cabcba65bc073f0a7.tar.gz
Qt-a3627a496c3b7c6c007fe01cabcba65bc073f0a7.tar.bz2
Return qmlInfo(obj) << syntax.
Fixes QTBUG-5480
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp b/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
index 8241045..22841e5 100644
--- a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
+++ b/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
@@ -77,14 +77,14 @@ void tst_qmlinfo::qmlObject()
QString message = "QML " + QString(object->metaObject()->className()) + " (" + component.url().toString() + ":3:1) Test Message";
QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
- qmlInfo("Test Message", object);
+ qmlInfo(object) << "Test Message";
QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
QVERIFY(nested != 0);
message = "QML " + QString(nested->metaObject()->className()) + " (" + component.url().toString() + ":6:13) Second Test Message";
QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
- qmlInfo("Second Test Message", nested);
+ qmlInfo(nested) << "Second Test Message";
}
void tst_qmlinfo::nestedQmlObject()
@@ -101,28 +101,28 @@ void tst_qmlinfo::nestedQmlObject()
QString message = "QML " + QString(nested->metaObject()->className()) + " (" + component.url().toString() + ":5:13) Outer Object";
QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
- qmlInfo("Outer Object", nested);
+ qmlInfo(nested) << "Outer Object";
message = "QML " + QString(nested2->metaObject()->className()) + " (" + TEST_FILE("NestedObject.qml").toString() + ":6:14) Inner Object";
QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
- qmlInfo("Inner Object", nested2);
+ qmlInfo(nested2) << "Inner Object";
}
void tst_qmlinfo::nonQmlObject()
{
QObject object;
QTest::ignoreMessage(QtWarningMsg, "QML QObject (unknown location) Test Message");
- qmlInfo("Test Message", &object);
+ qmlInfo(&object) << "Test Message";
QPushButton pbObject;
QTest::ignoreMessage(QtWarningMsg, "QML QPushButton (unknown location) Test Message");
- qmlInfo("Test Message", &pbObject);
+ qmlInfo(&pbObject) << "Test Message";
}
void tst_qmlinfo::nullObject()
{
QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message");
- qmlInfo("Null Object Test Message", 0);
+ qmlInfo(0) << "Null Object Test Message";
}
void tst_qmlinfo::nonQmlContextedObject()
@@ -131,7 +131,7 @@ void tst_qmlinfo::nonQmlContextedObject()
QmlContext context(&engine);
QmlEngine::setContextForObject(&object, &context);
QTest::ignoreMessage(QtWarningMsg, "QML QObject (unknown location) Test Message");
- qmlInfo("Test Message", &object);
+ qmlInfo(&object) << "Test Message";
}
QTEST_MAIN(tst_qmlinfo)