diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 08:48:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 08:48:32 (GMT) |
| commit | 46822d7091ef05e64e363e7209ea3e613e4d386d (patch) | |
| tree | a9b083d01f41464f3fd8230f27d8b5d8c51dd55a | |
| parent | e2c45cbacaa0f48e1397572d3e5baa847c86e9b1 (diff) | |
| parent | 6967f9e3fadfff8122809207dc7a99af444f699b (diff) | |
| download | Qt-46822d7091ef05e64e363e7209ea3e613e4d386d.zip Qt-46822d7091ef05e64e363e7209ea3e613e4d386d.tar.gz Qt-46822d7091ef05e64e363e7209ea3e613e4d386d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix build with cups 1.5 snapshots
| -rw-r--r-- | src/gui/painting/qcups_p.h | 1 |
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 |