diff options
| author | John Layt <jlayt@kde.org> | 2012-04-29 14:13:10 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-07 20:26:43 +0200 |
| commit | 80f7a388906f94f58bf765a32b9abbb16f967db2 (patch) | |
| tree | ba858ff71ee97d479ea2543a9e3dfd634049f86e /src/corelib | |
| parent | 36547f4eff44361f7a6acd0cff107c0e47561f93 (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')
| -rw-r--r-- | src/corelib/global/qconfig-large.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-medium.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
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 |