diff options
| author | John Layt <jlayt@kde.org> | 2012-05-09 23:47:14 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 17:40:55 +0200 |
| commit | f70924e9ccc016b979bc74bba156600639184be7 (patch) | |
| tree | a470d6ac093035526cbc3840e0588d33c003e05f /src/printsupport/kernel/qcups_p.h | |
| parent | 704bd686315deeaf86a15d1eb37af56b0b0e184b (diff) | |
QtPrintSupport: Add CUPS printsupport plugin
Move CUPS code around to create a new CUPS printsupport plugin, this
fixes QPrinterInfo for CUPS which depends on the plugin to work.
It QT_NO_CUPS is defined then the plugin is not built and only Print
to PDF is supported under Linux.
* Move unused genericiunixprintersupport plugin to start new CUPS
printsupport plugin
* Split QPdfPrintEngine to create QCupsPrintEngine
* Remove LPR related code from QPdfPrintEngine
* Move CUPS specific code from plugin base class to derived CUPS class
* Remove forcing CUPS print engine to use PDF mode as PDF is now Native
* Move qt_getCupsPrinterPaperSizes from qprinterinfo_unix to
QCUPSSupport
* Remove qprinterinfo_unix as no longer used
* Remove all QT_NO_LPR uses
There is now no CUPS specific code left in printsupport/kernel except
QCUPSSupport which is needed for the dialogs.
Task-number: QTBUG-23060
Change-Id: Ie8fa4512a2424edc8943068e0fa9fb714cc42db9
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/printsupport/kernel/qcups_p.h')
| -rw-r--r-- | src/printsupport/kernel/qcups_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index cbf153f347..e68805d3c1 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -61,9 +61,19 @@ #include <QtCore/qlibrary.h> #include <cups/cups.h> #include <cups/ppd.h> +#include "qprintengine.h" QT_BEGIN_NAMESPACE +// HACK! Define these here temporarily so they can be used in the dialogs +// without a circular reference to QCupsPrintEngine in the plugin. +// Move back to qcupsprintengine_p.h in the plugin once all usage +// removed from the dialogs. +#define PPK_CupsOptions QPrintEngine::PrintEnginePropertyKey(0xfe00) +#define PPK_CupsPageRect QPrintEngine::PrintEnginePropertyKey(0xfe01) +#define PPK_CupsPaperRect QPrintEngine::PrintEnginePropertyKey(0xfe02) +#define PPK_CupsStringPageSize QPrintEngine::PrintEnginePropertyKey(0xfe03) + Q_DECLARE_TYPEINFO(cups_option_t, Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE); class Q_PRINTSUPPORT_EXPORT QCUPSSupport |