summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.h
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/corelib/global/qfeatures.h
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/corelib/global/qfeatures.h')
-rw-r--r--src/corelib/global/qfeatures.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 54c1be8bd3..d0774c55d6 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -512,8 +512,8 @@
#endif
// Common UNIX Printing System
-#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY))
-#define QT_NO_CUPS
+#if !defined(QT_NO_PRINTER) && defined(QT_NO_LIBRARY) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#define QT_NO_PRINTER
#endif
// QErrorMessage