diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/printsupport/kernel/qprintengine_win_p.h | |
parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/printsupport/kernel/qprintengine_win_p.h')
-rw-r--r-- | src/printsupport/kernel/qprintengine_win_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index baf8ccefce..8da6f32268 100644 --- a/src/printsupport/kernel/qprintengine_win_p.h +++ b/src/printsupport/kernel/qprintengine_win_p.h @@ -58,6 +58,7 @@ #include <QtGui/qpaintengine.h> #include <QtPrintSupport/QPrintEngine> #include <QtPrintSupport/QPrinter> +#include <QtPrintSupport/QPrinterInfo> #include <private/qpaintengine_alpha_p.h> #include <QtCore/qt_windows.h> @@ -102,8 +103,8 @@ public: HDC getDC() const; void releaseDC(HDC) const; - HDC getPrinterDC() const { return getDC(); } - void releasePrinterDC(HDC dc) const { releaseDC(dc); } + static QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &printerInfo); + static void queryDefaultPrinter(QString &name, QString &program, QString &port); private: friend class QPrintDialog; |