diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
| commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
| tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp | |
| parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
| parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to 'src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp')
| -rw-r--r-- | src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp b/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp index 1f851ba1..365692dc 100644 --- a/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp +++ b/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp @@ -71,7 +71,9 @@ bool QWidgetPlatformMessageDialog::show(Qt::WindowFlags flags, Qt::WindowModalit m_dialog->setIcon(static_cast<QMessageBox::Icon>(options->icon())); m_dialog->setText(options->text()); m_dialog->setInformativeText(options->informativeText()); +#if QT_CONFIG(textedit) m_dialog->setDetailedText(options->detailedText()); +#endif m_dialog->setStandardButtons(static_cast<QMessageBox::StandardButtons>(int(options->standardButtons()))); return QWidgetPlatformDialog::show(m_dialog.data(), flags, modality, parent); |