From 3fb7e5aee9fb8633812884c5d49c3285e02b9d2e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 18 Jun 2013 16:08:47 +0200 Subject: [PATCH] Dialogs examples: remove QLayout::SetNoConstraint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These constraints were adjusted in qt4 commit 3abaecc in order to make the dialogs fit Symbian/Maemo screens. These are not mobile oriented examples and it breaks resizing behavior on desktop so badly, that we will simply revert the constraint changes to make the dialogs respect their minimum sizes. Task-number: QTBUG-31351 Change-Id: Ibf358ddedadf05614ef7a66b6a98fe5d7073996f Reviewed-by: Thorbjørn Lund Martsum Reviewed-by: Topi Reiniö Reviewed-by: Jerome Pasion Reviewed-by: Caroline Chao --- examples/widgets/dialogs/findfiles/window.cpp | 1 - examples/widgets/dialogs/tabdialog/tabdialog.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/widgets/dialogs/findfiles/window.cpp b/examples/widgets/dialogs/findfiles/window.cpp index 80894bab478..908c0c0c340 100644 --- a/examples/widgets/dialogs/findfiles/window.cpp +++ b/examples/widgets/dialogs/findfiles/window.cpp @@ -63,7 +63,6 @@ Window::Window(QWidget *parent) //! [1] QGridLayout *mainLayout = new QGridLayout; - mainLayout->setSizeConstraint(QLayout::SetNoConstraint); mainLayout->addWidget(fileLabel, 0, 0); mainLayout->addWidget(fileComboBox, 0, 1, 1, 2); mainLayout->addWidget(textLabel, 1, 0); diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.cpp b/examples/widgets/dialogs/tabdialog/tabdialog.cpp index 39f74f1c6c3..80d8623af53 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.cpp +++ b/examples/widgets/dialogs/tabdialog/tabdialog.cpp @@ -65,7 +65,6 @@ TabDialog::TabDialog(const QString &fileName, QWidget *parent) //! [4] QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->setSizeConstraint(QLayout::SetNoConstraint); mainLayout->addWidget(tabWidget); mainLayout->addWidget(buttonBox); setLayout(mainLayout);