diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 07:48:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 07:48:23 (GMT) |
| commit | 05f4a80d7c49c1185f656c7daf52552824724324 (patch) | |
| tree | 7d9deeb68cb66a506172ad6b9e0b8bc9d4ebc9d6 /tests/auto/qgraphicsanchorlayout | |
| parent | 73b32e942696156c7c9fe84682394ec26f16c5c6 (diff) | |
| parent | 849ebd5eceed33b6abc72aef3085afefc8d927ba (diff) | |
| download | Qt-05f4a80d7c49c1185f656c7daf52552824724324.zip Qt-05f4a80d7c49c1185f656c7daf52552824724324.tar.gz Qt-05f4a80d7c49c1185f656c7daf52552824724324.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (572 commits)
Fix tst_Q3ProgressBar::setProgress, again
Disable tst_Q3ComboBox::task231724_clear on Mac
Fix tst_Q3ProgressBar::setProgress()
Revert "Fix double painting when adding an item into a linear layout"
Add missing license headers
Revert "Fixed a crash in QListView"
Symbol table is very limited in numeric input mode
Fix build of Qt/DirectFB without graphics view support.
Add new QSysInfo::symbianVersion() enums
QDesktopServices::openUrl() doesn't handle URL encodings correctly
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Benchmark for layout hierarchies
Manual test for layout flickering
...
Diffstat (limited to 'tests/auto/qgraphicsanchorlayout')
| -rw-r--r-- | tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index e7c63d5..447385a 100644 --- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -1091,6 +1091,9 @@ void tst_QGraphicsAnchorLayout::setSpacing() #ifdef Q_WS_MAC QTest::qWait(200); #endif + + // 21x21 + QCOMPARE(p->size(), QSizeF(41, 41)); QCOMPARE(a->geometry(), QRectF(0, 0, 20, 20)); QCOMPARE(b->geometry(), QRectF(21, 0, 20, 20)); QCOMPARE(c->geometry(), QRectF(0, 21, 41, 20)); |