diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
commit | 6c067866db65f113237a4c28374317c948da8ba9 (patch) | |
tree | c8920e1ecbd4c6875691f52d5579e7264fb4af0d /src/gui/painting/qprinter.cpp | |
parent | 61bec93c12bdc2912b38264386af07f80c3c0272 (diff) | |
parent | 90a65aa6611eb33229cdc00ffe6c22012944ba1a (diff) | |
download | Qt-6c067866db65f113237a4c28374317c948da8ba9.zip Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.gz Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.bz2 |
Merge branch '4.5'
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
Diffstat (limited to 'src/gui/painting/qprinter.cpp')
-rw-r--r-- | src/gui/painting/qprinter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 5161e32..5efe0be 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -284,8 +284,8 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke to send PostScript or PDF output to the printer. As an alternative, the printProgram() function can be used to specify the command or utility to use instead of the system default. - - Note that setting parameters like paper size and resolution on an + + Note that setting parameters like paper size and resolution on an invalid printer is undefined. You can use QPrinter::isValid() to verify this before changing any parameters. @@ -744,7 +744,7 @@ void QPrinter::setOutputFormat(OutputFormat format) #ifndef QT_NO_PDF Q_D(QPrinter); - if (d->outputFormat == format) + if (d->validPrinter && d->outputFormat == format) return; d->outputFormat = format; @@ -773,8 +773,8 @@ void QPrinter::setOutputFormat(OutputFormat format) if (def_engine) delete oldPrintEngine; - d->validPrinter = d->outputFormat == QPrinter::PdfFormat || d->outputFormat == QPrinter::PostScriptFormat; - + d->validPrinter = (d->outputFormat == QPrinter::PdfFormat + || d->outputFormat == QPrinter::PostScriptFormat); #else Q_UNUSED(format); #endif |