diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-10-16 12:45:18 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-10-16 12:45:18 (GMT) |
| commit | 25f4ccc3a9de2e4610974540f88c331238218c72 (patch) | |
| tree | 24a7234243ebbf823d641c8cfd36a939bc8ecffb /src/gui/dialogs/qwizard.cpp | |
| parent | 93c7ab5a2b10481e4f10a6477379d8157ae5f7b0 (diff) | |
| download | Qt-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/qwizard.cpp')
| -rw-r--r-- | src/gui/dialogs/qwizard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 0f6d353..0102e25 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -1340,7 +1340,7 @@ bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const pushButton->setText(buttonDefaultText(wizStyle, which, this)); #ifdef QT_SOFTKEYS_ENABLED - QAction *softKey = new QAction(pushButton->text(), antiFlickerWidget); + QAction *softKey = new QAction(pushButton->text(), pushButton); QAction::SoftKeyRole softKeyRole; switch(which) { case QWizard::NextButton: |