Revert "QtPrintSupport: Remove remaining LPR specific code"
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 8 May 2012 02:56:45 +0000 (12:56 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 8 May 2012 04:58:27 +0000 (06:58 +0200)
commitde11b9f5a7aaab79e816983a72b8e92ac84ce5d6
treeaafbf1b22400bbaf90046b415490667164a2d93a
parent80f7a388906f94f58bf765a32b9abbb16f967db2
Revert "QtPrintSupport: Remove remaining LPR specific code"

This doesn't compile with a typical cross-compilation setup, which
generally won't include cups headers.  The commit should have been
rejected, but wasn't, due to a bug in the Qt Project CI.

Since it now causes all other modules depending on qtbase to fail their
CI, it must be reverted to minimize disruption while the commit can be
amended and/or the test toolchain updated to include cups headers.

This reverts commit 80f7a388906f94f58bf765a32b9abbb16f967db2.

Change-Id: I315ae275b37de358a74af28ab7bd691c9849acba
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
23 files changed:
src/corelib/global/qconfig-large.h
src/corelib/global/qconfig-medium.h
src/corelib/global/qconfig-minimal.h
src/corelib/global/qconfig-nacl.h
src/corelib/global/qconfig-small.h
src/corelib/global/qfeatures.h
src/corelib/global/qglobal.h
src/gui/painting/qpdf_p.h
src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
src/printsupport/dialogs/qpagesetupdialog_unix.cpp
src/printsupport/dialogs/qprintdialog_unix.cpp
src/printsupport/kernel/kernel.pri
src/printsupport/kernel/qcups.cpp
src/printsupport/kernel/qcups_p.h
src/printsupport/kernel/qplatformprintersupport_qpa.cpp
src/printsupport/kernel/qprintengine_pdf.cpp
src/printsupport/kernel/qprintengine_pdf_p.h
src/printsupport/kernel/qprinter.cpp
src/printsupport/kernel/qprinterinfo_p.h
src/printsupport/kernel/qprinterinfo_unix.cpp [new file with mode: 0644]
src/printsupport/kernel/qprinterinfo_unix_p.h [new file with mode: 0644]
tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp
tools/configure/configureapp.cpp