equal
deleted
inserted
replaced
422 |
422 |
423 void QProgressDialog::setCancelButton(QPushButton *cancelButton) |
423 void QProgressDialog::setCancelButton(QPushButton *cancelButton) |
424 { |
424 { |
425 Q_D(QProgressDialog); |
425 Q_D(QProgressDialog); |
426 delete d->cancel; |
426 delete d->cancel; |
427 #ifdef QT_SOFTKEYS_ENABLED |
|
428 delete d->cancelAction; |
|
429 d->cancelAction = 0; |
|
430 #endif |
|
431 d->cancel = cancelButton; |
427 d->cancel = cancelButton; |
432 if (cancelButton) { |
428 if (cancelButton) { |
433 if (cancelButton->parentWidget() == this) { |
429 if (cancelButton->parentWidget() == this) { |
434 cancelButton->hide(); // until we resize |
430 cancelButton->hide(); // until we resize |
435 } else { |
431 } else { |