QprintDialog - Fix loss of page settings.

If you click on the properties button and change the page settings and
click OK, then click properties a second time and click cancel, then
your original changes are forgotten.  Ensure the properties dialog is
only deleted if the OK button has never been clicked.

Change-Id: I81be8a2c941eeec36c03647d7fea8f498154930a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
bb10
John Layt 2013-12-07 23:33:01 +01:00 committed by The Qt Project
parent c719c38403
commit df56ef1651
1 changed files with 1 additions and 1 deletions

View File

@ -929,7 +929,7 @@ void QUnixPrintWidgetPrivate::_q_btnPropertiesClicked()
if (!propertiesDialog)
setupPrinterProperties();
propertiesDialog->exec();
if (propertiesDialog->result() == QDialog::Rejected) {
if (!propertiesDialogShown && propertiesDialog->result() == QDialog::Rejected) {
// If properties dialog was rejected the dialog is deleted and
// the properties are set to defaults when printer is setup
delete propertiesDialog;