diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-12-08 14:04:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 17:31:38 +0100 |
| commit | bacae725e584f51ee2fd83af7bef3e4515de9587 (patch) | |
| tree | 6275b15e915e38c6e2ffb988354ea8ed3ada31d4 /src/gui/dialogs | |
| parent | 40fb4750910e23d3e7128ca8e0f1c5920b05bd5a (diff) | |
Various Qt documentation fixes (wk 44)
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-22172
Task-number: QTBUG-15738
Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/dialogs/qmessagebox.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 6ef9d708ec..6df771e0f4 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -430,7 +430,9 @@ 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 used from QMessageBox instance the result code type is \l QMessageBox::StandardButton Do not call this function if the dialog was constructed with the Qt::WA_DeleteOnClose attribute. diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index a60324e1a3..f9d4efa436 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -2749,6 +2749,8 @@ 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. |