summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2012-10-09 23:34:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-13 05:51:19 +0200
commite24dd4d48f73bb6988f7b88ff94a2aa589f7518b (patch)
treeda787389b4478defd81225aa37db4e3c851792c7
parent9dbe3dc3a6ad41adfd3aa1e58885f1abc6a0890e (diff)
QtPrintSupport: Fix build with QT_NO_PICTURE.
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>
-rw-r--r--src/plugins/printsupport/cups/qcupsprintersupport_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
index 1321e83586..17fd1cf89e 100644
--- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
@@ -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>