diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
| commit | 33418800a5c78e06182bc0b41a2eabaf8aafc0fc (patch) | |
| tree | a5e30275f88c6f473b1e3d09f42c94799f7ac21e /src/gui/dialogs/qprogressdialog.cpp | |
| parent | 74b0c482b1edf606e1326c9053c612a7e514dee4 (diff) | |
| parent | 971acc6d34559a2c5035888a5891ea29ad8628af (diff) | |
| download | Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.zip Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.gz Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/dialogs/qprogressdialog.cpp')
| -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) { |