diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-26 09:11:48 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 12:29:03 +0200 |
commit | 264272fb88358c1bc681442bbfd4673de29ef969 (patch) | |
tree | 426ff7b31cdaef8bedb048605e97a34c9cafffde /src/printsupport/kernel/qprinter.cpp | |
parent | 1b345e865599cc7a3d840199be04aebd9bfa1796 (diff) |
QtPrintSupport: Remove Q_WS_QPA, qpa sections from .pro files.
Compile without -qpa.
Change-Id: Icfbf733964a7d6db80f8ec706a4b6fe84cd71b4d
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Diffstat (limited to 'src/printsupport/kernel/qprinter.cpp')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 3271ef8ccc..d748bbddbf 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -159,7 +159,7 @@ Q_PRINTSUPPORT_EXPORT QSizeF qt_printerPaperSize(QPrinter::Orientation orientati void QPrinterPrivate::createDefaultEngines() { QPrinter::OutputFormat realOutputFormat = outputFormat; -#if defined (Q_OS_UNIX) && ! defined (Q_WS_MAC) +#if defined (Q_OS_UNIX) if(outputFormat == QPrinter::NativeFormat) { realOutputFormat = QPrinter::PdfFormat; } @@ -167,7 +167,6 @@ void QPrinterPrivate::createDefaultEngines() switch (realOutputFormat) { case QPrinter::NativeFormat: { -#if defined (Q_WS_QPA) QPlatformPrinterSupport *ps = QPlatformPrinterSupportPlugin::get(); if (ps) { printEngine = ps->createNativePrintEngine(printerMode); @@ -177,16 +176,10 @@ void QPrinterPrivate::createDefaultEngines() paintEngine = pdfEngine; printEngine = pdfEngine; } -#elif defined (Q_WS_WIN) - QWin32PrintEngine *winEngine = new QWin32PrintEngine(printerMode); - paintEngine = winEngine; - printEngine = winEngine; -#elif defined (Q_WS_MAC) +#if defined (Q_WS_MAC) QMacPrintEngine *macEngine = new QMacPrintEngine(printerMode); paintEngine = macEngine; printEngine = macEngine; -#elif defined (Q_OS_UNIX) - Q_ASSERT(false); #endif } break; |