summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-07-22 12:42:07 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-07-22 12:42:59 (GMT)
commitdf2a1de1720476d096ad9be0a8cf5a0410206d82 (patch)
tree303a6f01d68f1e390db9905ac64369463acd2e7b /src/gui
parent51f4d0c1926335977c2aa814746a61b194d2f9d1 (diff)
parent1223a21a737e9fded46f2c761532bf535fb943b1 (diff)
downloadQt-df2a1de1720476d096ad9be0a8cf5a0410206d82.zip
Qt-df2a1de1720476d096ad9be0a8cf5a0410206d82.tar.gz
Qt-df2a1de1720476d096ad9be0a8cf5a0410206d82.tar.bz2
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogs/qmessagebox.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index b7fa420..31f73b9 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -1362,8 +1362,10 @@ void QMessageBox::setVisible(bool visible)
/*!
\overload
- Opens the dialog and connects its accepted() signal to the slot specified
- by \a receiver and \a member.
+ Opens the dialog and connects its finished() or buttonClicked() signal to
+ the slot specified by \a receiver and \a member. If the slot in \a member
+ has a pointer for its first parameter the connection is to buttonClicked(),
+ otherwise the connection is to finished().
The signal will be disconnected from the slot when the dialog is closed.
*/