diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-16 07:08:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-16 07:08:34 (GMT) |
| commit | 61aae4e9a033bfb59664105e5377fd086bacb517 (patch) | |
| tree | 92f6f6d70713be3e0033c6cf841e0b4e87e33512 /tests/auto/qwidget | |
| parent | 3efaed62e11e9e461f7244a99a233140b9f28510 (diff) | |
| parent | 6fa05b234e2bb6fdabcaf5eb4550b0b32a434fd1 (diff) | |
| download | Qt-61aae4e9a033bfb59664105e5377fd086bacb517.zip Qt-61aae4e9a033bfb59664105e5377fd086bacb517.tar.gz Qt-61aae4e9a033bfb59664105e5377fd086bacb517.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Fixes to how resize event and layout request are posted.
Fixed move a QGraphicsWidget and invalidate its layout at the same time
Fix infinite recursion when changing geometry on Mac
Diffstat (limited to 'tests/auto/qwidget')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index f85d469..43dd077 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -71,6 +71,7 @@ #include <QtGui/qpaintengine.h> #include <private/qbackingstore_p.h> #include <qmenubar.h> +#include <qtableview.h> #include <QtGui/QGraphicsView> #include <QtGui/QGraphicsProxyWidget> @@ -406,6 +407,7 @@ private slots: void childAt(); #ifdef Q_WS_MAC void childAt_unifiedToolBar(); + void taskQTBUG_17333_ResizeInfiniteRecursion(); #ifdef QT_MAC_USE_COCOA void taskQTBUG_11373(); #endif // QT_MAC_USE_COCOA @@ -10593,6 +10595,18 @@ void tst_QWidget::childAt_unifiedToolBar() QCOMPARE(mainWindow.childAt(labelTopLeft), static_cast<QWidget *>(label)); } +void tst_QWidget::taskQTBUG_17333_ResizeInfiniteRecursion() +{ + QTableView tb; + const char *s = "border: 1px solid;"; + tb.setStyleSheet(s); + tb.show(); + + QTest::qWaitForWindowShown(&tb); + tb.setGeometry(QRect(100, 100, 0, 100)); + // No crash, it works. +} + #ifdef QT_MAC_USE_COCOA void tst_QWidget::taskQTBUG_11373() { |