1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index a24f69b35e..92c7eaecec 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -154,6 +154,16 @@ bool macHasAccessToWindowsServer()
 }
 #endif
 
+// Make a widget frameless to prevent size constraints of title bars
+// from interfering (Windows).
+static inline void setFrameless(QWidget *w)
+{
+    Qt::WindowFlags flags = w->windowFlags();
+    flags |= Qt::FramelessWindowHint;
+    flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    w->setWindowFlags(flags);
+}
+
 class tst_QWidget : public QObject
 {
     Q_OBJECT
@@ -1969,6 +1979,7 @@ void tst_QWidget::showMaximized()
 
     {
         QWidget widget;
+        setFrameless(&widget);
         widget.setGeometry(0, 0, 10, 10);
         widget.showMaximized();
         QTRY_VERIFY(widget.size().width() > 20 && widget.size().height() > 20);
@@ -2080,6 +2091,7 @@ void tst_QWidget::resizeEvent()
 {
     {
         QWidget wParent;
+        wParent.resize(200, 200);
         ResizeWidget wChild(&wParent);
         wParent.show();
         QCOMPARE (wChild.m_resizeEventCount, 1); // initial resize event before paint
@@ -2095,6 +2107,7 @@ void tst_QWidget::resizeEvent()
 
     {
         ResizeWidget wTopLevel;
+        wTopLevel.resize(200, 200);
         wTopLevel.show();
         QCOMPARE (wTopLevel.m_resizeEventCount, 1); // initial resize event before paint for toplevels
         wTopLevel.hide();
@@ -2182,6 +2195,7 @@ void tst_QWidget::showMinimizedKeepsFocus()
     //testing deletion of the focusWidget
     {
         QWidget window;
+        window.resize(200, 200);
         QWidget *child = new QWidget(&window);
         child->setFocusPolicy(Qt::StrongFocus);
         window.show();
@@ -2199,6 +2213,7 @@ void tst_QWidget::showMinimizedKeepsFocus()
     //testing reparenting the focus widget
     {
         QWidget window;
+        window.resize(200, 200);
         QWidget *child = new QWidget(&window);
         child->setFocusPolicy(Qt::StrongFocus);
         window.show();
@@ -2216,6 +2231,7 @@ void tst_QWidget::showMinimizedKeepsFocus()
     //testing setEnabled(false)
     {
         QWidget window;
+        window.resize(200, 200);
         QWidget *child = new QWidget(&window);
         child->setFocusPolicy(Qt::StrongFocus);
         window.show();
@@ -2233,6 +2249,7 @@ void tst_QWidget::showMinimizedKeepsFocus()
     //testing clearFocus
     {
         QWidget window;
+        window.resize(200, 200);
         QWidget *firstchild = new QWidget(&window);
         firstchild->setFocusPolicy(Qt::StrongFocus);
         QWidget *child = new QWidget(&window);
@@ -4501,6 +4518,7 @@ void tst_QWidget::setWindowGeometry()
 void tst_QWidget::setGeometry_win()
 {
     QWidget widget;
+    setFrameless(&widget);
     widget.setGeometry(0, 600, 100,100);
     widget.show();
     widget.setWindowState(widget.windowState() | Qt::WindowMaximized);
@@ -5727,6 +5745,7 @@ void tst_QWidget::childEvents()
     {
         // no children created, not shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -5746,6 +5765,7 @@ void tst_QWidget::childEvents()
     {
         // no children, shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -5786,6 +5806,7 @@ void tst_QWidget::childEvents()
     {
         // 2 children, not shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -5821,6 +5842,7 @@ void tst_QWidget::childEvents()
     {
         // 2 children, widget shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -5877,6 +5899,7 @@ void tst_QWidget::childEvents()
     {
         // 2 children, but one is reparented away, not shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -5913,6 +5936,7 @@ void tst_QWidget::childEvents()
     {
         // 2 children, but one is reparented away, then widget is shown
         QWidget widget;
+        widget.resize(200, 200);
         EventRecorder spy;
         widget.installEventFilter(&spy);
 
@@ -7328,6 +7352,7 @@ void tst_QWidget::alienWidgets()
         QWidget *toolBar = new QWidget(&mainWindow);
         QWidget *dockWidget = new QWidget(&mainWindow);
         QWidget *centralWidget = new QWidget(&mainWindow);
+        centralWidget->setMinimumSize(QSize(200, 200));
 
         QWidget *button = new QWidget(centralWidget);
         QWidget *mdiArea = new QWidget(centralWidget);
@@ -7844,6 +7869,7 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
 void tst_QWidget::effectiveWinId()
 {
     QWidget parent;
+    parent.resize(200, 200);
     QWidget child(&parent);
 
     // Shouldn't crash.