diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-03-10 06:35:44 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-03-10 06:35:44 (GMT) |
commit | fedf97276ce8b9b982b2d897a40f5b6428c710a8 (patch) | |
tree | ada6810c08189df96d59c2b4b3bb83efd96150e3 /tests | |
parent | 7b29dc7daa035a351ba10dcfb879bc3f70434f63 (diff) | |
parent | 099d63fd9b4017b8e02b2cfaae82f29c0c0d294f (diff) | |
download | Qt-fedf97276ce8b9b982b2d897a40f5b6428c710a8.zip Qt-fedf97276ce8b9b982b2d897a40f5b6428c710a8.tar.gz Qt-fedf97276ce8b9b982b2d897a40f5b6428c710a8.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index 9d8ba6c..6b7d57f 100644 --- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -373,7 +373,6 @@ void tst_qdeclarativeanchors::crash1() QString expect = "QML Text (" + source.toString() + ":4:5" + ") Possible anchor loop detected on fill."; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); - QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message QDeclarativeView *view = new QDeclarativeView(source); qApp->processEvents(); |