summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 02:45:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 02:45:08 (GMT)
commit3c5991eb22f048c2053166ec50ea3ae70697a53f (patch)
tree2e5a92c34df5b6959e8b29582cb749972b052df8 /src
parent7c555955e96bc188bfebdea2cd066d871f151b59 (diff)
parent8b8a4e960be30d64d2bc093662ddb1cefeae524e (diff)
downloadQt-3c5991eb22f048c2053166ec50ea3ae70697a53f.zip
Qt-3c5991eb22f048c2053166ec50ea3ae70697a53f.tar.gz
Qt-3c5991eb22f048c2053166ec50ea3ae70697a53f.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qcups_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/qcups_p.h b/src/gui/painting/qcups_p.h
index 9259679..239c244 100644
--- a/src/gui/painting/qcups_p.h
+++ b/src/gui/painting/qcups_p.h
@@ -59,6 +59,7 @@
#ifndef QT_NO_CUPS
#include <QtCore/qlibrary.h>
#include <cups/cups.h>
+#include <cups/ppd.h>
QT_BEGIN_NAMESPACE