diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /examples/widgets/dialogs | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'examples/widgets/dialogs')
| -rw-r--r-- | examples/widgets/dialogs/standarddialogs/dialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index fdd3633950..3630f48ef3 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -47,6 +47,9 @@ "and any number of buttons, each with standard or custom texts." \ "<p>Click a button to close the message box. Pressing the Esc button " \ "will activate the detected escape button (if any).") +#define MESSAGE_DETAILS \ + Dialog::tr("If a message box has detailed text, the user can reveal it " \ + "by pressing the Show Details... button.") class DialogOptionsWidget : public QGroupBox @@ -466,6 +469,7 @@ void Dialog::warningMessage() { QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"), MESSAGE, 0, this); + msgBox.setDetailedText(MESSAGE_DETAILS); msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole); msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole); if (msgBox.exec() == QMessageBox::AcceptRole) |