summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-12-13 13:06:03 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:08 (GMT)
commit45bdaac4636b69ddbae446ec65082a90290dda52 (patch)
tree42ebdbee0b784783ceaf53a9d1b38948b8add90c /src/gui
parent08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f (diff)
downloadQt-45bdaac4636b69ddbae446ec65082a90290dda52.zip
Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.gz
Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.bz2
Various qt documentation fixes (wk 44)
Fixes for bugs: QTBUG-13362, QTBUG-15738, QTBUG-15921, QTBUG-18356, QTBUG-18417, QTBUG-18664, QTBUG-21562, QTBUG-22094, and QTBUG-18741.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogs/qdialog.cpp4
-rw-r--r--src/gui/dialogs/qmessagebox.cpp2
-rw-r--r--src/gui/kernel/qwidget.cpp4
-rw-r--r--src/gui/widgets/qabstractbutton.cpp4
4 files changed, 10 insertions, 4 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index 4c6c3bc..d7d9a95 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 f18fe60..ebfc0eb 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.
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 39b15a3..952966e 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -3302,8 +3302,8 @@ QList<QAction*> QWidget::actions() const
\property QWidget::enabled
\brief whether the widget is enabled
- An enabled widget handles keyboard and mouse events; a disabled
- widget does not.
+ In general an enabled widget handles keyboard and mouse events; a disabled
+ widget does not. An exception is made with \l{QAbstractButton}.
Some widgets display themselves differently when they are
disabled. For example a button might draw its label grayed out. If
diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp
index 354677d..0f9a5be 100644
--- a/src/gui/widgets/qabstractbutton.cpp
+++ b/src/gui/widgets/qabstractbutton.cpp
@@ -114,7 +114,9 @@ Q_GUI_EXPORT extern bool qt_tab_all_widgets;
checkable buttons can be checked and unchecked (see below).
\o isEnabled() indicates whether the button can be pressed by the
- user.
+ user. \note As opposed to other widgets, buttons derived from
+ QAbstractButton accepts mouse and context menu events
+ when disabled.
\o setAutoRepeat() sets whether the button will auto-repeat if the
user holds it down. \l autoRepeatDelay and \l autoRepeatInterval