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/printsupport/kernel/kernel.pri | |
| 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/printsupport/kernel/kernel.pri')
| -rw-r--r-- | src/printsupport/kernel/kernel.pri | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index 10d9f877a0..d3a48b8766 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -18,13 +18,6 @@ SOURCES += \ $$PWD/qplatformprintplugin.cpp \ $$PWD/qplatformprintersupport_qpa.cpp -unix:!mac { - HEADERS += \ - $$PWD/qprinterinfo_unix_p.h - SOURCES += \ - $$PWD/qprinterinfo_unix.cpp -} - win32 { HEADERS += \ $$PWD/qprintengine_win_p.h @@ -34,7 +27,7 @@ win32 { } mac|win32 { - DEFINES += QT_NO_CUPS QT_NO_LPR + DEFINES += QT_NO_CUPS } else { SOURCES += $$PWD/qcups.cpp HEADERS += $$PWD/qcups_p.h |