diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
| commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
| tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /examples/widgets/mainwindows/mainwindow/mainwindow.cpp | |
| parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
| parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'examples/widgets/mainwindows/mainwindow/mainwindow.cpp')
| -rw-r--r-- | examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp index a0aedb6f24..a21a64bdd4 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp @@ -429,7 +429,7 @@ CreateDockWidgetDialog::CreateDockWidgetDialog(QWidget *parent) QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::reject); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); layout->addWidget(buttonBox, 2, 0, 1, 2); } |