diff options
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/kernel.pri | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index e2fcd8d1dd..d7c9f56545 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -18,7 +18,7 @@ SOURCES += \ $$PWD/qplatformprintplugin.cpp \ $$PWD/qplatformprintersupport_qpa.cpp -unix { +unix:!mac { HEADERS += \ $$PWD/qprinterinfo_unix_p.h SOURCES += \ @@ -33,7 +33,7 @@ win32 { LIBS += -lWinspool -lComdlg32 } -win32 { +mac|win32 { DEFINES += QT_NO_CUPS QT_NO_LPR } else { SOURCES += $$PWD/qcups.cpp diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 85dc59ff34..404f45d509 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -155,7 +155,7 @@ Q_PRINTSUPPORT_EXPORT QSizeF qt_printerPaperSize(QPrinter::Orientation orientati void QPrinterPrivate::createDefaultEngines() { QPrinter::OutputFormat realOutputFormat = outputFormat; -#if defined (Q_OS_UNIX) +#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) if(outputFormat == QPrinter::NativeFormat) { realOutputFormat = QPrinter::PdfFormat; } |