diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-09-16 12:51:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-18 23:51:09 +0200 |
| commit | 38fc46c5d81f08328cec474e2f7f8b9285bccefc (patch) | |
| tree | 9ec10cb3f02b5004bd70b0790681202ddc25cf25 /tests/auto/declarative/qdeclarativeinfo | |
| parent | 912d7b38e10a536ebd3ad998a9a84d6ffac2b8bc (diff) | |
Test fixes and reenables.
Change-Id: I85e3493855b6fefb682ddb120b15abd003fb00fd
Reviewed-on: http://codereview.qt-project.org/5045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeinfo')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index c79516e0ef..71ff738619 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -42,7 +42,7 @@ #include <qtest.h> #include <QDeclarativeEngine> #include <QDeclarativeComponent> -#include <QPushButton> +#include <QTimer> #include <QDeclarativeContext> #include <qdeclarativeinfo.h> @@ -143,9 +143,9 @@ void tst_qdeclarativeinfo::nonQmlObject() QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QtObject: Test Message"); qmlInfo(&object) << "Test Message"; - QPushButton pbObject; - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QPushButton: Test Message"); - qmlInfo(&pbObject) << "Test Message"; + QTimer nonQmlObject; + QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QTimer: Test Message"); + qmlInfo(&nonQmlObject) << "Test Message"; } void tst_qdeclarativeinfo::nullObject() |