diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2013-04-24 15:02:40 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 09:34:12 +0200 |
| commit | 5be73820b872dfed6a31a43a7876755450a438b6 (patch) | |
| tree | 22fe5c59e4ab98529c79db16b2008db32996e8d4 | |
| parent | 45cebacd7ad3b9871e8ccfb1fcd87b6c0bb3f66a (diff) | |
| download | qttools-5be73820b872dfed6a31a43a7876755450a438b6.tar.gz | |
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>
| -rw-r--r-- | src/assistant/assistant/centralwidget.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index 29648fe6f..ccab203f5 100644 --- 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 8f6d978a7..f8c042c5d 100644 --- 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 c1c257f2a..d7780e3e0 100644 --- 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 |