7 files changed, 2 insertions, 18 deletions
diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h
index a3d241f8e6..264ed273c4 100644
--- a/src/corelib/global/qconfig-large.h
+++ b/src/corelib/global/qconfig-large.h
@@ -132,9 +132,6 @@
 #ifndef QT_NO_PRINTER
 #  define QT_NO_PRINTER
 #endif
-#ifndef QT_NO_CUPS
-#  define QT_NO_CUPS
-#endif
 
 /* Qt for Embedded Linux */
 #ifndef QT_NO_QWS_SOUNDSERVER
diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
index ba91303409..4b417f3a79 100644
--- a/src/corelib/global/qconfig-medium.h
+++ b/src/corelib/global/qconfig-medium.h
@@ -168,9 +168,6 @@
 #ifndef QT_NO_PRINTER
 #  define QT_NO_PRINTER
 #endif
-#ifndef QT_NO_CUPS
-#  define QT_NO_CUPS
-#endif
 
 /* Qt for Embedded Linux */
 #ifndef QT_NO_QWSEMBEDWIDGET
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 57aa26b381..5fa6c87aa1 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -304,9 +304,6 @@
 #ifndef QT_NO_PRINTER
 #  define QT_NO_PRINTER
 #endif
-#ifndef QT_NO_CUPS
-#  define QT_NO_CUPS
-#endif
 
 /* Qt for Embedded Linux */
 #ifndef QT_NO_QWSEMBEDWIDGET
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index 7e48afaee3..083fc33bbc 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -230,9 +230,6 @@
 #ifndef QT_NO_PRINTER
 #  define QT_NO_PRINTER
 #endif
-#ifndef QT_NO_CUPS
-#  define QT_NO_CUPS
-#endif
 
 /* Qt for Embedded Linux */
 #ifndef QT_NO_QWSEMBEDWIDGET
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index 0c0e6aa01a..f0b95fe45c 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -196,9 +196,6 @@
 #ifndef QT_NO_PRINTER
 #  define QT_NO_PRINTER
 #endif
-#ifndef QT_NO_CUPS
-#  define QT_NO_CUPS
-#endif
 
 /* Qt for Embedded Linux */
 #ifndef QT_NO_QWS_SOUNDSERVER
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
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index a8547a3ab8..061793caa7 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -451,7 +451,6 @@ class QDataStream;
 #if defined(Q_OS_VXWORKS)
 #  define QT_NO_CRASHHANDLER     // no popen
 #  define QT_NO_PROCESS          // no exec*, no fork
-#  define QT_NO_LPR
 #  define QT_NO_SHAREDMEMORY     // only POSIX, no SysV and in the end...
 #  define QT_NO_SYSTEMSEMAPHORE  // not needed at all in a flat address space
 #endif