summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-08 10:46:48 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-08 10:46:48 (GMT)
commita2d584df2b72ed5bcd4886dcccafd7a54308f36b (patch)
treef394b25101bc5bb6c3f0bc48e2f3e269e96359a7 /src/gui
parent2412b0410dcf97cf348ce703722a1b4f7ce623df (diff)
parentd1889402eff75b8dabf67e80c16e3e3316d187e8 (diff)
downloadQt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.zip
Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.gz
Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qprinter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index 6cecf2c..5090b3a 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -773,8 +773,8 @@ void QPrinter::setOutputFormat(OutputFormat format)
if (def_engine)
delete oldPrintEngine;
- d->validPrinter = (d->outputFormat == QPrinter::PdfFormat
- || d->outputFormat == QPrinter::PostScriptFormat);
+ if (d->outputFormat == QPrinter::PdfFormat || d->outputFormat == QPrinter::PostScriptFormat)
+ d->validPrinter = true;
#else
Q_UNUSED(format);
#endif