build fix for the case when QT_NO_PRINTER is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 7717935..3e59fb7 100644 (file)
--- 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 <limits.h>
 #include <math.h>
@@ -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 1927a1a..f90d2c7 100644 (file)
--- 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 82dbb71..891137a 100644 (file)
--- 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 a772a72..849c3be 100644 (file)
--- 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"