From fc93b01089ce829690943e9fd5c99f3acda99520 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 25 Feb 2022 22:56:52 +0200 Subject: [PATCH] build fix for the case when QT_NO_PRINTER is defined Signed-off-by: Ivailo Monev --- src/gui/painting/qprintengine_pdf.cpp | 4 ++-- src/gui/painting/qprintengine_pdf_p.h | 4 ++-- src/gui/painting/qprintengine_ps.cpp | 4 ---- src/gui/painting/qprintengine_ps_p.h | 2 ++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp index 77179359e..3e59fb7da 100644 --- a/src/gui/painting/qprintengine_pdf.cpp +++ b/src/gui/painting/qprintengine_pdf.cpp @@ -36,7 +36,7 @@ #include "qcorecommon_p.h" #include "qguicommon_p.h" -#ifndef QT_NO_PDF +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PDF) #include #include @@ -1077,4 +1077,4 @@ void QPdfEnginePrivate::printString(const QString &string) { QT_END_NAMESPACE -#endif // QT_NO_PDF +#endif // QT_NO_PRINTER && QT_NO_PDF diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h index 1927a1a87..f90d2c72f 100644 --- a/src/gui/painting/qprintengine_pdf_p.h +++ b/src/gui/painting/qprintengine_pdf_p.h @@ -35,7 +35,7 @@ #include "QtGui/qprintengine.h" -#ifndef QT_NO_PDF +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PDF) #include "QtCore/qmap.h" #include "QtGui/qmatrix.h" @@ -171,6 +171,6 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PDF +#endif // QT_NO_PRINTER && QT_NO_PDF #endif // QPRINTENGINE_PDF_P_H diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp index 82dbb71f3..891137a9c 100644 --- a/src/gui/painting/qprintengine_ps.cpp +++ b/src/gui/painting/qprintengine_ps.cpp @@ -851,7 +851,3 @@ QPrinter::PrinterState QPSPrintEngine::printerState() const QT_END_NAMESPACE #endif // QT_NO_PRINTER - - - - diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h index a772a7202..849c3be38 100644 --- a/src/gui/painting/qprintengine_ps_p.h +++ b/src/gui/painting/qprintengine_ps_p.h @@ -34,6 +34,8 @@ // We mean it. // +#include "qglobal.h" + #ifndef QT_NO_PRINTER #include "qpdf_p.h" -- 2.11.0