QtPrintSupport: Fix build with QT_NO_PICTURE.
authorSérgio Martins <sergio.martins@kdab.com>
Tue, 9 Oct 2012 22:34:29 +0000 (23:34 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sat, 13 Oct 2012 03:51:19 +0000 (05:51 +0200)
Printer support depends on having Picture support.
If QT_NO_PICTURE is defined, qfeatures.h will define
QT_NO_PRINTER.

Not all code is including qfeatures.h, which causes inconsistency,
some code has QT_NO_PRINTER defined and some has not, which causes
the build to fail.

Change-Id: I10a854244a41d017b921b731ec0e08f90a3326cf
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
src/plugins/printsupport/cups/qcupsprintersupport_p.h

index 1321e83..17fd1cf 100644 (file)
@@ -42,6 +42,7 @@
 #ifndef QCUPSPRINTERSUPPORT_H
 #define QCUPSPRINTERSUPPORT_H
 
+#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER
 #ifndef QT_NO_PRINTER
 
 #include <qpa/qplatformprintersupport.h>