diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 16:21:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 16:21:02 (GMT) |
| commit | 7ffb18d137102553928f66209d13a85aa341392e (patch) | |
| tree | 0262a12552e343550d70cd759bb1df1942d9863c /tests | |
| parent | a32aedc044948965d91a21b9731d3c70a7dfb45c (diff) | |
| parent | 09ce407aaa4a00013a606bf0011faf6cbc654c72 (diff) | |
| download | Qt-7ffb18d137102553928f66209d13a85aa341392e.zip Qt-7ffb18d137102553928f66209d13a85aa341392e.tar.gz Qt-7ffb18d137102553928f66209d13a85aa341392e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index 5a3a54c..b78ef26 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -942,6 +942,7 @@ void tst_QGraphicsWidget::layout() layout->addItem(item); children.append(item); } + QSignalSpy spy(&widget, SIGNAL(layoutChanged())); widget.setLayout(layout); QTRY_COMPARE(widget.layout(), static_cast<QGraphicsLayout*>(layout)); @@ -950,7 +951,7 @@ void tst_QGraphicsWidget::layout() QCOMPARE(item->parentWidget(), (QGraphicsWidget *)&widget); QVERIFY(item->geometry() != QRectF(0, 0, -1, -1)); } - + QCOMPARE(spy.count(), 1); // don't crash widget.setLayout(0); } |