From 80f7a388906f94f58bf765a32b9abbb16f967db2 Mon Sep 17 00:00:00 2001 From: John Layt Date: Sun, 29 Apr 2012 14:13:10 +0100 Subject: 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 --- tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/auto/printsupport/kernel/qprinterinfo') diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 404aa06399..90aff47c86 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -246,6 +246,9 @@ void tst_QPrinterInfo::testForDefaultPrinter() void tst_QPrinterInfo::testForPrinters() { +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + QSKIP("Test doesn't work on Unix, plugin not yet enabled"); +# endif #if defined(Q_OS_UNIX) || defined(Q_OS_WIN32) # ifdef Q_OS_WIN32 if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { -- cgit v1.2.3