diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-08 15:56:48 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-08 15:56:48 +1000 |
| commit | 26590325b5e9209df4495841b9013d04bbb35515 (patch) | |
| tree | 2a4e44ca1e1d4389caf999ee8801a312166bf39c /src/imports/testlib/SignalSpy.qml | |
| parent | 5a705d8951a0b23c725d99a5a3fce7902ec41374 (diff) | |
| parent | 438d50d63c48bbbfd185bd7e1a0d6e6174c1791e (diff) | |
Merge branch 'v8'
Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h
Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
Diffstat (limited to 'src/imports/testlib/SignalSpy.qml')
| -rw-r--r-- | src/imports/testlib/SignalSpy.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml index ba51c5a33f..f32a9c6129 100644 --- a/src/imports/testlib/SignalSpy.qml +++ b/src/imports/testlib/SignalSpy.qml @@ -66,7 +66,7 @@ Item { i += 50 } var success = (count >= expected) - if (!qtest_results.verify(success, "wait for signal " + signalName, Qt.qtest_caller_file(), Qt.qtest_caller_line())) + if (!qtest_results.verify(success, "wait for signal " + signalName, QtTest.qtest_caller_file(), QtTest.qtest_caller_line())) throw new Error("QtQuickTest::fail") } |