summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-07 12:15:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-07 12:15:58 (GMT)
commitff9206bb268b816e1932eca7091bed16c9fd2426 (patch)
tree6beba0597775c54f747bb9de98f161e46aec47a4 /src/gui/painting
parent62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc (diff)
parent46822d7091ef05e64e363e7209ea3e613e4d386d (diff)
downloadQt-ff9206bb268b816e1932eca7091bed16c9fd2426.zip
Qt-ff9206bb268b816e1932eca7091bed16c9fd2426.tar.gz
Qt-ff9206bb268b816e1932eca7091bed16c9fd2426.tar.bz2
Merge branch 4.6 into qt-4.7-from-4.6
Diffstat (limited to 'src/gui/painting')
-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