Commit 5be73820 authored by Janne Anttila's avatar Janne Anttila Committed by The Qt Project
Browse files

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: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent 45cebacd
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.1 old/5.2 wip/cmake v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 6 additions and 0 deletions
...@@ -52,10 +52,12 @@ ...@@ -52,10 +52,12 @@
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtWidgets/QMenu> #include <QtWidgets/QMenu>
#ifndef QT_NO_PRINTER
#include <QtPrintSupport/QPageSetupDialog> #include <QtPrintSupport/QPageSetupDialog>
#include <QtPrintSupport/QPrintDialog> #include <QtPrintSupport/QPrintDialog>
#include <QtPrintSupport/QPrintPreviewDialog> #include <QtPrintSupport/QPrintPreviewDialog>
#include <QtPrintSupport/QPrinter> #include <QtPrintSupport/QPrinter>
#endif
#include <QtWidgets/QStackedWidget> #include <QtWidgets/QStackedWidget>
#include <QtWidgets/QTextBrowser> #include <QtWidgets/QTextBrowser>
#include <QtWidgets/QVBoxLayout> #include <QtWidgets/QVBoxLayout>
......
...@@ -85,7 +85,9 @@ ...@@ -85,7 +85,9 @@
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtWidgets/QMdiSubWindow> #include <QtWidgets/QMdiSubWindow>
#ifndef QT_NO_PRINTER
#include <QtPrintSupport/QPrintDialog> #include <QtPrintSupport/QPrintDialog>
#endif
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QTransform> #include <QtGui/QTransform>
#include <QtGui/QCursor> #include <QtGui/QCursor>
......
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#ifndef QT_NO_PRINTER
#include <QtPrintSupport/QPrinter> #include <QtPrintSupport/QPrinter>
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment