summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
authorJohn Layt <jlayt@kde.org>2012-04-29 14:13:10 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-07 20:26:43 +0200
commit80f7a388906f94f58bf765a32b9abbb16f967db2 (patch)
treeba858ff71ee97d479ea2543a9e3dfd634049f86e /src/platformsupport
parent36547f4eff44361f7a6acd0cff107c0e47561f93 (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/platformsupport')
-rw-r--r--src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
index 2fb9562545..f60bba2a07 100644
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
+++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
@@ -48,23 +48,17 @@ QT_BEGIN_NAMESPACE
QList<QPrinter::PaperSize> QGenericUnixPrinterSupport::supportedPaperSizes(const QPrinterInfo &printerInfo) const
{
-#ifndef QT_NO_CUPS
return QCUPSSupport::getCupsPrinterPaperSizes(QPlatformPrinterSupport::printerInfoCupsPrinterIndex(printerInfo));
-#else
- return QList<QPrinter::PaperSize>();
-#endif
}
QList<QPrinterInfo> QGenericUnixPrinterSupport::availablePrinters()
{
QList<QPrinterInfo> printers;
-#ifndef QT_NO_CUPS
foreach (const QCUPSSupport::Printer &p, QCUPSSupport::availableUnixPrinters()) {
QPrinterInfo printer(QPlatformPrinterSupport::printerInfo(p.name, p.isDefault));
QPlatformPrinterSupport::setPrinterInfoCupsPrinterIndex(&printer, p.cupsPrinterIndex);
printers.append(printer);
}
-#endif
return printers;
}