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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d3084e19a7..7ddc0ecbc7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1392,8 +1392,6 @@ void Configure::applySpecSpecifics() dictionary[ "QT_QWS_DEPTH" ] = "4 8 16 24 32"; dictionary[ "QT_SXE" ] = "no"; dictionary[ "QT_INOTIFY" ] = "no"; - dictionary[ "QT_LPR" ] = "no"; - dictionary[ "QT_CUPS" ] = "no"; dictionary[ "QT_GLIB" ] = "no"; dictionary[ "QT_ICONV" ] = "no"; @@ -2851,18 +2849,12 @@ void Configure::generateConfigfiles() tmpStream<<"#define QT_QWS_DEPTH_"+depth<<endl; } - if (dictionary[ "QT_CUPS" ] == "no") - tmpStream<<"#define QT_NO_CUPS"<<endl; - if (dictionary[ "QT_ICONV" ] == "no") tmpStream<<"#define QT_NO_ICONV"<<endl; if (dictionary[ "QT_GLIB" ] == "no") tmpStream<<"#define QT_NO_GLIB"<<endl; - if (dictionary[ "QT_LPR" ] == "no") - tmpStream<<"#define QT_NO_LPR"<<endl; - if (dictionary[ "QT_INOTIFY" ] == "no") tmpStream<<"#define QT_NO_INOTIFY"<<endl; |