summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 03:50:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 03:50:38 (GMT)
commitf3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3 (patch)
tree2e5a92c34df5b6959e8b29582cb749972b052df8
parent9db54ffde4f820d610575e4980d2b19b03b2f6b1 (diff)
parent3c5991eb22f048c2053166ec50ea3ae70697a53f (diff)
downloadQt-f3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3.zip
Qt-f3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3.tar.gz
Qt-f3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix build with cups 1.5 snapshots
-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