path: root/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
diff options
authorBradley T. Hughes <>2012-04-30 14:26:47 +0200
committerQt by Nokia <>2012-05-09 13:42:03 +0200
commitab947649eb984b006a856d41476e615dc901bcf7 (patch)
tree9edee6b47b64ae8c89941c0d01db982973af86d3 /src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
parent9f2f7a8f7270411677f2074fdf635f8b4b94d325 (diff)
QPA: Cleanup native dialog modal execution
Remove the _q_platformRunNativeAppModalPanel() function, together with the launchNativeAppModalPanel() signal and emitLaunchNativeAppModalPanel() slot, which were previously used to run the modal loop inside the QDialog::exec() loop. This trick isn't necessary anymore, so remove the mechanism and code related to it. Rename QPlatformDialogHelper::platformNativeDialogModalHelp() to exec_sys(). This function is now responsible for both showing the native dialog and running the modal loop. QDialog:exec() now calls this function if a native dialog is in use (it does not call QEventLoop::exec() anymore). The dialogResultCode_sys() function was unused, so it has also been removed. This commit also removes some unused private slots that were left over from the port to QPA. Note that the comments in the Cocoa plugin are still valid and relevant, but this commit does not fix the scenarios mentioned. This will be done in a future commit. The Windows plugin needs minor changes. The QueuedConnections to accept() and reject() cause the deliver to come too late, resulting in crashes, hence the change to AutoConnection (which ends up being a DirectConnection). Change-Id: Ifc90325c945ca78737e60bf331929f03ecc52e0a Reviewed-by: Friedemann Kleint <> Reviewed-by: Morten Johan Sørvig <>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafontdialoghelper.h')
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
index 501e67deb3..d135a958df 100644
--- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
@@ -56,15 +56,13 @@ public:
virtual ~QCocoaFontDialogHelper();
- void platformNativeDialogModalHelp();
- void _q_platformRunNativeAppModalPanel();
+ void exec_sys();
void deleteNativeDialog_sys();
bool show_sys(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent);
void hide_sys();
- QPlatformDialogHelper::DialogCode dialogResultCode_sys();
void setCurrentFont_sys(const QFont &);
QFont currentFont_sys() const;