summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-05-08 12:56:45 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-08 06:58:27 +0200
commitde11b9f5a7aaab79e816983a72b8e92ac84ce5d6 (patch)
treeaafbf1b22400bbaf90046b415490667164a2d93a /src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
parent80f7a388906f94f58bf765a32b9abbb16f967db2 (diff)
Revert "QtPrintSupport: Remove remaining LPR specific code"
This doesn't compile with a typical cross-compilation setup, which generally won't include cups headers. The commit should have been rejected, but wasn't, due to a bug in the Qt Project CI. Since it now causes all other modules depending on qtbase to fail their CI, it must be reverted to minimize disruption while the commit can be amended and/or the test toolchain updated to include cups headers. This reverts commit 80f7a388906f94f58bf765a32b9abbb16f967db2. Change-Id: I315ae275b37de358a74af28ab7bd691c9849acba Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp')
-rw-r--r--src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
index f60bba2a07..2fb9562545 100644
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
+++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
@@ -48,17 +48,23 @@ 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;
}