diff options
| author | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
| commit | 064dc31b190f737e2ae83d3629c31512cb69435c (patch) | |
| tree | a73dbe6e68b88bf175e2925e834d6051eb6a90aa /tests/manual/windowmodality/main.cpp | |
| parent | 9abfe7031db60bb8e2c16e2fbe92b0950089168c (diff) | |
| parent | b754deb055db1b3d74f4ecaed38fa7e59fdcd877 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tests/manual/windowmodality/main.cpp')
| -rw-r--r-- | tests/manual/windowmodality/main.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/manual/windowmodality/main.cpp b/tests/manual/windowmodality/main.cpp index db3a0b072f..cfd7658064 100644 --- a/tests/manual/windowmodality/main.cpp +++ b/tests/manual/windowmodality/main.cpp @@ -93,7 +93,10 @@ private: Dialog *dialog = new Dialog(parent); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setWindowModality(windowModality); - dialog->show(); + if (windowModality == Qt::ApplicationModal && applicationModalUseExecCheckBox->isChecked()) + dialog->exec(); + else + dialog->show(); } void newChildWidget(Qt::WindowModality windowModality) { @@ -107,7 +110,7 @@ private: bool event(QEvent *event) { if (event->type() == QEvent::WindowBlocked) - setPalette(Qt::red); + setPalette(Qt::darkGray); else if (event->type() == QEvent::WindowUnblocked) setPalette(QPalette()); return QWidget::event(event); @@ -156,7 +159,10 @@ private: Dialog *dialog = new Dialog(withParent ? this : 0); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setWindowModality(windowModality); - dialog->show(); + if (windowModality == Qt::ApplicationModal && applicationModalUseExecCheckBox->isChecked()) + dialog->exec(); + else + dialog->show(); } void newChildWidget(Qt::WindowModality windowModality) { |