diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-06-16 15:09:09 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-17 16:55:52 +0000 |
| commit | aec2b28eea3354ec80350e25f4305c74ca9bc184 (patch) | |
| tree | c2955629a2baf2b684f171699321acfe301ee13c /src/widgets/dialogs | |
| parent | 997f52b83d41d2ed31a3b36384d1dd3bc78a697c (diff) | |
OSX: show file dialog in showCocoaFilePanel, don't wait for exec()
This reverts commit 21e6c7ae4745a76b676dfaa9fe17a2dd40fc0c5c
because in QtQuick.Controls, we do not call exec(): we just set the
dialog visible. If it is a sheet, then it is already acting as a
modal dialog, basically.
Task-number: QTBUG-46691
Change-Id: I7fe89f2a2ade0d4ddcf540c9bfc4f5963a077471
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 6676a3ccba..65def6d4b8 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -534,10 +534,7 @@ int QDialog::exec() QPointer<QDialog> guard = this; if (d->nativeDialogInUse) { - if (windowModality() == Qt::WindowModal) - d->platformHelper()->execModalForWindow(d->parentWindow()); - else - d->platformHelper()->exec(); + d->platformHelper()->exec(); } else { QEventLoop eventLoop; d->eventLoop = &eventLoop; |