summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/qprogressdialog.cpp
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-10-16 12:45:18 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-10-16 12:45:18 (GMT)
commit25f4ccc3a9de2e4610974540f88c331238218c72 (patch)
tree24a7234243ebbf823d641c8cfd36a939bc8ecffb /src/gui/dialogs/qprogressdialog.cpp
parent93c7ab5a2b10481e4f10a6477379d8157ae5f7b0 (diff)
downloadQt-25f4ccc3a9de2e4610974540f88c331238218c72.zip
Qt-25f4ccc3a9de2e4610974540f88c331238218c72.tar.gz
Qt-25f4ccc3a9de2e4610974540f88c331238218c72.tar.bz2
Softkeys remain disabled if action owning action widget is enabled
Softkeys have a QAction that is related to some action widget. The initial state of the action was set according the state of action widget (enabled/disabled). Now, if action widget's state changes, the softkey's action remain in the initial state. This was fixed by removing the enable/disable from the QAction and instead use the real state of action widget when handling the command of softkey. Task-number: QTBUG-4619 Reviewed-by: Janne Anttila
Diffstat (limited to 'src/gui/dialogs/qprogressdialog.cpp')
-rw-r--r--src/gui/dialogs/qprogressdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp
index 5fb10bf..f5024bb 100644
--- a/src/gui/dialogs/qprogressdialog.cpp
+++ b/src/gui/dialogs/qprogressdialog.cpp
@@ -453,7 +453,7 @@ void QProgressDialog::setCancelButton(QPushButton *cancelButton)
cancelButton->show();
#else
{
- d->cancelAction = new QAction(cancelButton->text(), this);
+ d->cancelAction = new QAction(cancelButton->text(), cancelButton);
d->cancelAction->setSoftKeyRole(QAction::NegativeSoftKey);
connect(d->cancelAction, SIGNAL(triggered()), this, SIGNAL(canceled()));
addAction(d->cancelAction);