diff options
| author | John Layt <jlayt@kde.org> | 2012-04-29 14:13:10 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-07 20:26:43 +0200 |
| commit | 80f7a388906f94f58bf765a32b9abbb16f967db2 (patch) | |
| tree | ba858ff71ee97d479ea2543a9e3dfd634049f86e /src/printsupport/kernel/qplatformprintersupport_qpa.cpp | |
| parent | 36547f4eff44361f7a6acd0cff107c0e47561f93 (diff) | |
QtPrintSupport: Remove remaining LPR specific code
CUPS is the only supported print system on UNIX, LPR/PS support has
already been dropped but some LPR specific code still remains.
* Move qt_getCupsPrinterPaperSizes from qprinterinfo_unix to
QCUPSSupport
* Remove qprinterinfo_unix as no longer used
* Remove LPR related code from QPdfPrintEngine
* Remove all QT_NO_LPR uses
* Remove most QT_NO_CUPS uses, use QT_NO_PRINTER where necessary
Some QT_NO_CUPS uses remain in QPdfPrintEngine, these will be removed
in a following change implementing a CUPS plugin.
Change-Id: I439b6fad9cf88c3d24aa48e49475f49ad310dbad
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/printsupport/kernel/qplatformprintersupport_qpa.cpp')
| -rw-r--r-- | src/printsupport/kernel/qplatformprintersupport_qpa.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp index 9c0c3f131c..2680e28f0c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp @@ -116,22 +116,12 @@ bool QPlatformPrinterSupport::printerInfoIsDefault(const QPrinterInfo &p) 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 } /* |