diff options
author | John Layt <jlayt@kde.org> | 2012-05-09 23:47:14 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 17:40:55 +0200 |
commit | f70924e9ccc016b979bc74bba156600639184be7 (patch) | |
tree | a470d6ac093035526cbc3840e0588d33c003e05f /src/printsupport/kernel/qplatformprintersupport_qpa.cpp | |
parent | 704bd686315deeaf86a15d1eb37af56b0b0e184b (diff) |
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>
Diffstat (limited to 'src/printsupport/kernel/qplatformprintersupport_qpa.cpp')
-rw-r--r-- | src/printsupport/kernel/qplatformprintersupport_qpa.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp index d2459dc91d..7bf2b291d0 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp @@ -117,26 +117,6 @@ bool QPlatformPrinterSupport::printerInfoIsDefault(const QPrinterInfo &p) return p.d_func()->isDefault; } -int QPlatformPrinterSupport::printerInfoCupsPrinterIndex(const QPrinterInfo &p) -{ -#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) - return p.isNull() ? -1 : p.d_func()->cupsPrinterIndex; -#else - Q_UNUSED(p) - return -1; -#endif -} - -void QPlatformPrinterSupport::setPrinterInfoCupsPrinterIndex(QPrinterInfo *p, int index) -{ -#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) - p->d_func()->cupsPrinterIndex = index; -#else - Q_UNUSED(p) - Q_UNUSED(index) -#endif -} - /* Converts QSizeF in millimeters to a predefined PaperSize (returns Custom if the size isn't a standard size) |