diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-08-20 16:38:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 16:13:38 +0200 |
| commit | 82860b133c123d8136cf13e99f66c4b55badc5fa (patch) | |
| tree | 0e00e3786aefcd1fac44ed4e555767e10d8c7291 /src/widgets/kernel | |
| parent | 8133af25031880b7d28e4e9d6124f48fb986b683 (diff) | |
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 <marc.mutz@kdab.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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() |