From c26562033b7b71e26527ec013f3750d07ec6100a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Fri, 15 Jan 2016 11:33:14 +0100
Subject: 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>
---
 src/widgets/dialogs/qfiledialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
 }
 
 /*!
-- 
cgit v1.2.3