diff options
| author | John Layt <jlayt@kde.org> | 2013-12-07 20:17:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 15:40:18 +0100 |
| commit | bd1a609aef4b2e2e36c0fe43c18b175a951b2e55 (patch) | |
| tree | b1e6407314ab45ea2eaf482d06a756f849a694bf /src | |
| parent | b0f83f2284af777f17e06e084a2399f9ad2a87f8 (diff) | |
QPrintDialog - Fix Cups printer setup sequence
First set up the selected output format, printer and page size, and then
setup the selected job options. This ensures all values are correctly
setup for the requested format and printer as not all settings may be
able to persist across the change in output format or printer.
Change-Id: I67f261f4e3be479a9018139633886ee8e570f42a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 41a01abf3b..a903d170f2 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -412,6 +412,10 @@ void QPrintDialogPrivate::applyPrinterProperties() void QPrintDialogPrivate::setupPrinter() { + // First setup the requested OutputFormat, Printer and Page Size first + top->d->setupPrinter(); + + // Then setup Print Job options Q_Q(QPrintDialog); QPrinter* p = q->printer(); @@ -479,8 +483,6 @@ void QPrintDialogPrivate::setupPrinter() // copies p->setCopyCount(options.copies->value()); p->setCollateCopies(options.collate->isChecked()); - - top->d->setupPrinter(); } void QPrintDialogPrivate::_q_togglePageSetCombo(bool checked) |