diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:34 +0100 |
commit | 777cdb00e704b987ad19bf842088a754cf7e6525 (patch) | |
tree | b8f2356d68e293c591c9be86113ed46478867e0b /src/printsupport | |
parent | dc9e32caeda0278658befb8bb6e944986c021620 (diff) | |
parent | af1dbfd2239c7834187f3a702fb2029dc78d4526 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 0905cbb59f..819f9343f7 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -55,10 +55,7 @@ #include <private/qpagedpaintdevice_p.h> - -#ifndef QT_NO_PDF #include "qprintengine_pdf_p.h" -#endif #include <qpicture.h> #include <private/qpaintengine_preview_p.h> @@ -618,8 +615,6 @@ QPrinter::~QPrinter() */ void QPrinter::setOutputFormat(OutputFormat format) { - -#ifndef QT_NO_PDF Q_D(QPrinter); if (d->validPrinter && d->outputFormat == format) return; @@ -651,9 +646,6 @@ void QPrinter::setOutputFormat(OutputFormat format) if (d->outputFormat == QPrinter::PdfFormat) d->validPrinter = true; -#else - Q_UNUSED(format); -#endif } /*! |