diff options
| author | Bernhard Rosenkraenzer <br@blankpage.ch> | 2010-10-07 08:33:05 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 08:44:16 (GMT) |
| commit | 6967f9e3fadfff8122809207dc7a99af444f699b (patch) | |
| tree | a9b083d01f41464f3fd8230f27d8b5d8c51dd55a /src/gui/painting | |
| parent | c2d539bbb25220105ee79de6d0d59e686508d765 (diff) | |
| download | Qt-6967f9e3fadfff8122809207dc7a99af444f699b.zip Qt-6967f9e3fadfff8122809207dc7a99af444f699b.tar.gz Qt-6967f9e3fadfff8122809207dc7a99af444f699b.tar.bz2 | |
Fix build with cups 1.5 snapshots
Without this patch, Qt CUPS support fails to build with current
CUPS snapshots:
In file included from ../../include/QtGui/private/qcups_p.h:1:0,
from painting/qpdf.cpp:47:
.../qcups_p.h:78:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:80:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:81:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:84:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:87:34: error: ISO C++ forbids declaration of 'type
name' with no type
.../qcups_p.h:87:47: error: template argument 1 is invalid
.../qcups_p.h:103:56: error: 'ppd_group_t' does not name a type
.../qcups_p.h:103:77: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:104:62: error: 'ppd_group_t' does not name a type
.../qcups_p.h:104:75: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:108:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:110:5: error: 'ppd_file_t' does not name a type
Merge-request: 835
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/gui/painting')
| -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 |