diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-05 11:23:36 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-05 11:23:36 (GMT) |
| commit | 9093d6c498f1b70c7ec58fc52bb9d5f0a4302540 (patch) | |
| tree | 5bb0e87be487d80c76a16c23ee94e7f97fcc95c6 /src/gui/dialogs | |
| parent | cbdf3dc7508131e31f1d221e7b6f44d4714d3caa (diff) | |
| parent | 291a26abae4b7e1e4b77baf42964ccb77edf4adf (diff) | |
| download | Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.zip Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.tar.gz Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qprogressdialog.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp index f5024bb..98b15e9 100644 --- a/src/gui/dialogs/qprogressdialog.cpp +++ b/src/gui/dialogs/qprogressdialog.cpp @@ -424,10 +424,6 @@ void QProgressDialog::setCancelButton(QPushButton *cancelButton) { Q_D(QProgressDialog); delete d->cancel; -#ifdef QT_SOFTKEYS_ENABLED - delete d->cancelAction; - d->cancelAction = 0; -#endif d->cancel = cancelButton; if (cancelButton) { if (cancelButton->parentWidget() == this) { |