diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/widgets/dialogs/qdialog.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/widgets/dialogs/qdialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index e1097dd1bb3..af352e45c60 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -1041,7 +1041,7 @@ QSize QDialog::minimumSizeHint() const \property QDialog::modal \brief whether show() should pop up the dialog as modal or modeless - By default, this property is false and show() pops up the dialog + By default, this property is \c false and show() pops up the dialog as modeless. Setting his property to true is equivalent to setting QWidget::windowModality to Qt::ApplicationModal. |