diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-03-19 15:31:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 18:02:39 +0100 |
| commit | 4bcd8fc2dee683da632466e6de5d782f52263951 (patch) | |
| tree | dd61d751af0f32130e9941904be5e0caee9e81b7 /src/printsupport/kernel/qprintengine_win_p.h | |
| parent | 2d5a4a5d3aae4efe7c17cadf03dfbb5cc4c36e86 (diff) | |
Fix infinite recursion crash in QPrinterInfo::supportedPaperSizes()
This function calls platform specific function
QWindowsPrinterSupport::supportedPaperSizes(), which then called back
to QPrinterInfo::supportedPaperSizes(), causing infinite recursion.
Fixed by providing a proper implementation for querying supported
paper sizes in QWin32PrintEngine - the same implementation was used in
Qt 4.8.
Task-number: QTBUG-24190
Change-Id: I64a2773d83596df19818bf2636f1255943d7851d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/printsupport/kernel/qprintengine_win_p.h')
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index baf8ccefce..c267c1057f 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> @@ -105,6 +106,8 @@ public: HDC getPrinterDC() const { return getDC(); } void releasePrinterDC(HDC dc) const { releaseDC(dc); } + static QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &printerInfo); + private: friend class QPrintDialog; friend class QPageSetupDialog; |