From f70924e9ccc016b979bc74bba156600639184be7 Mon Sep 17 00:00:00 2001 From: John Layt Date: Wed, 9 May 2012 23:47:14 +0100 Subject: QtPrintSupport: Add CUPS printsupport plugin Move CUPS code around to create a new CUPS printsupport plugin, this fixes QPrinterInfo for CUPS which depends on the plugin to work. It QT_NO_CUPS is defined then the plugin is not built and only Print to PDF is supported under Linux. * Move unused genericiunixprintersupport plugin to start new CUPS printsupport plugin * Split QPdfPrintEngine to create QCupsPrintEngine * Remove LPR related code from QPdfPrintEngine * Move CUPS specific code from plugin base class to derived CUPS class * Remove forcing CUPS print engine to use PDF mode as PDF is now Native * Move qt_getCupsPrinterPaperSizes from qprinterinfo_unix to QCUPSSupport * Remove qprinterinfo_unix as no longer used * Remove all QT_NO_LPR uses There is now no CUPS specific code left in printsupport/kernel except QCUPSSupport which is needed for the dialogs. Task-number: QTBUG-23060 Change-Id: Ie8fa4512a2424edc8943068e0fa9fb714cc42db9 Reviewed-by: Teemu Katajisto Reviewed-by: Lars Knoll Reviewed-by: John Layt --- src/printsupport/kernel/kernel.pri | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/printsupport/kernel/kernel.pri') diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index 1ab9c3a0eb..e53e02bdc5 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -18,13 +18,6 @@ SOURCES += \ $$PWD/qplatformprintplugin.cpp \ $$PWD/qplatformprintersupport_qpa.cpp -unix:!mac { - HEADERS += \ - $$PWD/qprinterinfo_unix_p.h - SOURCES += \ - $$PWD/qprinterinfo_unix.cpp -} - win32 { HEADERS += \ $$PWD/qprintengine_win_p.h @@ -33,9 +26,7 @@ win32 { LIBS += -lwinspool -lcomdlg32 } -mac|win32 { - DEFINES += QT_NO_CUPS QT_NO_LPR -} else { +unix:!mac:contains(QT_CONFIG, cups): { SOURCES += $$PWD/qcups.cpp HEADERS += $$PWD/qcups_p.h } -- cgit v1.2.3