diff options
| author | Teemu Katajisto <teemu.katajisto@digia.com> | 2012-02-09 10:17:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 08:59:29 +0100 |
| commit | 752a02143b8b29bfde40d1e70482bc051457f251 (patch) | |
| tree | fc38c3aebe10d0d240f3c9e996d3d8afa5809ec0 /src/widgets/dialogs | |
| parent | b9cf3dec9042bc0527e405da2b7f78ebfc561804 (diff) | |
Various documentation fixes ported from Qt 4.8
Final set of selected documentation fixes for qtbase
from Qt 4.8 commit bacae725e584f51ee2fd83af7bef3e4515de9587
Task-number: QTBUG-13362
Task-number: QTBUG-18356
Task-number: QTBUG-18417
Task-number: QTBUG-18664
Task-number: QTBUG-21562
Task-number: QTBUG-22094
Task-number: QTBUG-18741
Task-number: QTBUG-15921
Task-number: QTBUG-15738
Change-Id: I3bd33bb7ce7aa991913ba82f3ea0e4b124f3ee41
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 861cbf902c..41683a261b 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -430,7 +430,11 @@ bool QDialog::event(QEvent *e) #endif /*! - Returns the modal dialog's result code, \c Accepted or \c Rejected. + In general returns the modal dialog's result code, \c Accepted or + \c Rejected. + + \note When called on a QMessageBox instance, the returned value is a + value of the \l QMessageBox::StandardButton enum. Do not call this function if the dialog was constructed with the Qt::WA_DeleteOnClose attribute. diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index c6ffaa2788..634e911cd1 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -2597,6 +2597,9 @@ QPixmap QMessageBox::standardIcon(Icon icon) When using QMessageBox with custom buttons, this function returns an opaque value; use clickedButton() to determine which button was clicked. + \note The result() function returns also \l StandardButton value instead + of \l QDialog::DialogCode. + Users cannot interact with any other window in the same application until they close the dialog, either by clicking a button or by using a mechanism provided by the window system. |