From 82860b133c123d8136cf13e99f66c4b55badc5fa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 20 Aug 2012 16:38:05 +0200 Subject: Propagate initial size constraints to QWidgetWindow. Size constraints set on a widget before the creation of the QWidgetWindow were lost (for example, Qt Creator's preference page). Task-number: QTBUG-26745 Change-Id: I7c2f5aed9c8817795603e5ad3c24418d66627bab Reviewed-by: Marc Mutz Reviewed-by: hjk --- src/widgets/kernel/qwidget_qpa.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/widgets/kernel/qwidget_qpa.cpp') diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index f03d2bd204..a1a414e4f4 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -925,8 +925,13 @@ void QWidgetPrivate::createTLSysExtra() Q_Q(QWidget); extra->topextra->screenIndex = 0; extra->topextra->window = 0; - if (q->testAttribute(Qt::WA_NativeWindow) || q->isWindow()) + if (q->testAttribute(Qt::WA_NativeWindow) || q->isWindow()) { extra->topextra->window = new QWidgetWindow(q); + if (extra->minw || extra->minh) + extra->topextra->window->setMinimumSize(QSize(extra->minw, extra->minh)); + if (extra->maxw != QWIDGETSIZE_MAX || extra->maxh != QWIDGETSIZE_MAX) + extra->topextra->window->setMaximumSize(QSize(extra->maxw, extra->maxh)); + } } void QWidgetPrivate::deleteTLSysExtra() -- cgit v1.2.3