Fix assistant and designer builds without printer.

The actual code using printer related classes is already wrapped with
QT_NO_PRINTER macros, but the include statements were not.

The reason why include statement probably were not wrapped with
QT_NO_PRINTER is that in Qt4 all headers were synchronized to include
directory. Now with Qt5 modularization headers for modules which
are disabled are not anymore synchronized to include directory so
they need to be wrapped with same ifdefs.

Change-Id: I0efd1342cd18860b5fed63b248812e9dced8f2b3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index 29648fe..ccab203 100644 (file)
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -52,10 +52,12 @@
 
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QMenu>
+#ifndef QT_NO_PRINTER
 #include <QtPrintSupport/QPageSetupDialog>
 #include <QtPrintSupport/QPrintDialog>
 #include <QtPrintSupport/QPrintPreviewDialog>
 #include <QtPrintSupport/QPrinter>
+#endif
 #include <QtWidgets/QStackedWidget>
 #include <QtWidgets/QTextBrowser>
 #include <QtWidgets/QVBoxLayout>

diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index 8f6d978..f8c042c 100644 (file)
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -85,7 +85,9 @@
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
 #include <QtWidgets/QMdiSubWindow>
+#ifndef QT_NO_PRINTER
 #include <QtPrintSupport/QPrintDialog>
+#endif
 #include <QtGui/QPainter>
 #include <QtGui/QTransform>
 #include <QtGui/QCursor>

diff --git a/src/designer/src/designer/qdesigner_actions.h b/src/designer/src/designer/qdesigner_actions.h
index c1c257f..d7780e3 100644 (file)
--- a/src/designer/src/designer/qdesigner_actions.h
+++ b/src/designer/src/designer/qdesigner_actions.h
@@ -47,7 +47,9 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
+#ifndef QT_NO_PRINTER
 #include <QtPrintSupport/QPrinter>
+#endif
 
 QT_BEGIN_NAMESPACE