summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-01-15 11:33:14 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-01-15 22:34:43 +0000
commitc26562033b7b71e26527ec013f3750d07ec6100a (patch)
treeb10a22e86ae3c609521f269924b30f8c3798989f /src/widgets/dialogs
parent8fd75739efd49a424e90938a51802f38c8c504e6 (diff)
QFileDialog: Check whether sizeHint() is valid before resizing.
Fixes a regression appearing in 5.5 where QtWidgets-based file dialogs showed up too small on Windows. Change-Id: I5f74ab01d4368d67ab79d3a1b145fb63bdd69ca0 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index bdfa27282f..06102ec1d6 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2822,7 +2822,9 @@ void QFileDialogPrivate::init(const QUrl &directory, const QString &nameFilter,
qFileDialogUi->sidebar->hide();
#endif
- q->resize(q->sizeHint());
+ const QSize sizeHint = q->sizeHint();
+ if (sizeHint.isValid())
+ q->resize(sizeHint);
}
/*!