diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-22 11:38:32 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-22 11:38:32 (GMT) |
| commit | 14f10211e72f2d04fa7f4e0faa430eb94c1f8f83 (patch) | |
| tree | 1e8d1e2f758c1090a15123cbcb8f615d867caa47 /tests/auto/qwidget | |
| parent | e4cce8849bf45be9a111072e3fca7bdf67364e8a (diff) | |
| parent | 5e80b137d195625c0d57c1c27e5e8464d1ccfa33 (diff) | |
| download | Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.zip Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.tar.gz Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
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 5550fe8..86773ad 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 @@ -10572,6 +10574,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() { |