diff options
| author | Joni Poikelin <joni.poikelin@theqtcompany.com> | 2015-11-24 09:51:12 +0200 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@theqtcompany.com> | 2015-11-24 08:35:42 +0000 |
| commit | e4d1bf9829c56dc446a07689758f22c58863d70d (patch) | |
| tree | 80e8118df6fb45a01c170d0d539cbb9343696f1c /src/widgets | |
| parent | 045abe631c3b971e212f2ca5c648b086753c47c5 (diff) | |
Fix crash in QFileDialog::iconProvider() with native dialogs
Task-number: QTBUG-49600
Change-Id: Ied28c0e7efa6b4dce25705dab98377848db5a6d3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 2d4ba1aeb9..4e0d70fb9a 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1938,6 +1938,8 @@ void QFileDialog::setIconProvider(QFileIconProvider *provider) QFileIconProvider *QFileDialog::iconProvider() const { Q_D(const QFileDialog); + if (!d->model) + return Q_NULLPTR; return d->model->iconProvider(); } |