diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-10-26 20:25:20 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-12-13 13:41:28 +0100 |
| commit | 53b413f1c589d976bbc1eb0ad2cc526633e247db (patch) | |
| tree | 6b5482253fd4eb211892cabac3511ab5ea7a96fa /src/plugins/platforms | |
| parent | 24e4fb34cdabf1d1d1d25b79edac03740b274549 (diff) | |
Rename QMessageDialogOptions::Icon to StandardIcon
To clarify its use as a pre-defined standard icon, which is a separate
use-case from providing a user-defined QIcon.
Change-Id: I187ce2e5f125a7392b1279c9bd1e871790c8065f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamessagedialog.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp index 05dd671122..65fd07ca5d 100644 --- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp +++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp @@ -57,7 +57,7 @@ bool QAndroidPlatformMessageDialogHelper::show(Qt::WindowFlags windowFlags, if (opt->supressionCheckBoxEnabled()) return false; // Can't support - m_javaMessageDialog.callMethod<void>("setIcon", "(I)V", opt->icon()); + m_javaMessageDialog.callMethod<void>("standardIcon", "(I)V", opt->standardIcon()); QString str = htmlText(opt->windowTitle()); if (!str.isEmpty()) { diff --git a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm index 84aea950c3..13be407848 100644 --- a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm +++ b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm @@ -91,7 +91,7 @@ bool QCocoaMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality w m_alert.messageText = text.toNSString(); m_alert.informativeText = toPlainText(options()->informativeText()).toNSString(); - switch (auto standardIcon = options()->icon()) { + switch (options()->standardIcon()) { case QMessageDialogOptions::NoIcon: { // We only reflect the pixmap icon if the standard icon is unset, // as setting a standard icon will also set a corresponding pixmap |