summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2013-01-14 12:39:28 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-29 10:00:49 (GMT)
commit9c2c59b7b81e0d3b6cd7d765b2b50f4667187c5c (patch)
treed2b0ba3fc08d241c9035e619c7c97e4ec8a336b3 /src/gui
parent8da495d38d8e5fe134fe5508144da68a3bb2d21c (diff)
downloadQt-9c2c59b7b81e0d3b6cd7d765b2b50f4667187c5c.zip
Qt-9c2c59b7b81e0d3b6cd7d765b2b50f4667187c5c.tar.gz
Qt-9c2c59b7b81e0d3b6cd7d765b2b50f4667187c5c.tar.bz2
Call endSheet when the QFileDialog was shown as a sheet on Mac
If the sheet is not ended then subseqent calls to show a sheet will not work correctly. Change-Id: Ib8a43a1c96a3dadff196c433e822f7579ad87b8b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> (cherry picked from commit 7024bc70917b6837e2d1e37b1d52350a28d978c5) Reviewed-by: Laszlo Papp <lpapp@kde.org>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 5628d06..982d5e6 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -228,6 +228,8 @@ QT_USE_NAMESPACE
*mCurrentSelection = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)([mSavePanel filename]);
if ([mSavePanel respondsToSelector:@selector(close)])
[mSavePanel close];
+ if ([mSavePanel isSheet])
+ [NSApp endSheet: mSavePanel];
}
- (void)showModelessPanel