QtPrintSupport: Add CUPS printsupport plugin
authorJohn Layt <jlayt@kde.org>
Wed, 9 May 2012 22:47:14 +0000 (23:47 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 31 May 2012 15:40:55 +0000 (17:40 +0200)
commitf70924e9ccc016b979bc74bba156600639184be7
treea470d6ac093035526cbc3840e0588d33c003e05f
parent704bd686315deeaf86a15d1eb37af56b0b0e184b
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 <teemu.katajisto@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: John Layt <jlayt@kde.org>
28 files changed:
src/corelib/global/qglobal.h
src/gui/painting/qpdf_p.h
src/platformsupport/platformsupport.pro
src/platformsupport/printersupport/genericunix/genericunix.pri [deleted file]
src/platformsupport/printersupport/printersupport.pri [deleted file]
src/plugins/printsupport/cups/cups.json [new file with mode: 0644]
src/plugins/printsupport/cups/cups.pro [new file with mode: 0644]
src/plugins/printsupport/cups/main.cpp [moved from src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp with 66% similarity]
src/plugins/printsupport/cups/qcupsprintengine.cpp [new file with mode: 0644]
src/plugins/printsupport/cups/qcupsprintengine_p.h [new file with mode: 0644]
src/plugins/printsupport/cups/qcupsprintersupport.cpp [new file with mode: 0644]
src/plugins/printsupport/cups/qcupsprintersupport_p.h [moved from src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h with 77% similarity]
src/plugins/printsupport/printsupport.pro
src/printsupport/dialogs/dialogs.pri
src/printsupport/dialogs/qpagesetupdialog_unix.cpp
src/printsupport/dialogs/qprintdialog_unix.cpp
src/printsupport/kernel/kernel.pri
src/printsupport/kernel/qcups.cpp
src/printsupport/kernel/qcups_p.h
src/printsupport/kernel/qplatformprintersupport.h
src/printsupport/kernel/qplatformprintersupport_qpa.cpp
src/printsupport/kernel/qprintengine_pdf.cpp
src/printsupport/kernel/qprintengine_pdf_p.h
src/printsupport/kernel/qprinter.cpp
src/printsupport/kernel/qprinterinfo.h
src/printsupport/kernel/qprinterinfo_unix.cpp [deleted file]
src/printsupport/kernel/qprinterinfo_unix_p.h [deleted file]
tools/configure/configureapp.cpp