diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-08 12:56:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 06:58:27 +0200 |
| commit | de11b9f5a7aaab79e816983a72b8e92ac84ce5d6 (patch) | |
| tree | aafbf1b22400bbaf90046b415490667164a2d93a /src/corelib | |
| parent | 80f7a388906f94f58bf765a32b9abbb16f967db2 (diff) | |
Revert "QtPrintSupport: Remove remaining LPR specific code"
This doesn't compile with a typical cross-compilation setup, which
generally won't include cups headers. The commit should have been
rejected, but wasn't, due to a bug in the Qt Project CI.
Since it now causes all other modules depending on qtbase to fail their
CI, it must be reverted to minimize disruption while the commit can be
amended and/or the test toolchain updated to include cups headers.
This reverts commit 80f7a388906f94f58bf765a32b9abbb16f967db2.
Change-Id: I315ae275b37de358a74af28ab7bd691c9849acba
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qconfig-large.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-medium.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
7 files changed, 18 insertions, 2 deletions
diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h index 264ed273c4..a3d241f8e6 100644 --- a/src/corelib/global/qconfig-large.h +++ b/src/corelib/global/qconfig-large.h @@ -132,6 +132,9 @@ #ifndef QT_NO_PRINTER # define QT_NO_PRINTER #endif +#ifndef QT_NO_CUPS +# define QT_NO_CUPS +#endif /* Qt for Embedded Linux */ #ifndef QT_NO_QWS_SOUNDSERVER diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h index 4b417f3a79..ba91303409 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -168,6 +168,9 @@ #ifndef QT_NO_PRINTER # define QT_NO_PRINTER #endif +#ifndef QT_NO_CUPS +# define QT_NO_CUPS +#endif /* Qt for Embedded Linux */ #ifndef QT_NO_QWSEMBEDWIDGET diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 5fa6c87aa1..57aa26b381 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -304,6 +304,9 @@ #ifndef QT_NO_PRINTER # define QT_NO_PRINTER #endif +#ifndef QT_NO_CUPS +# define QT_NO_CUPS +#endif /* Qt for Embedded Linux */ #ifndef QT_NO_QWSEMBEDWIDGET diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 083fc33bbc..7e48afaee3 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -230,6 +230,9 @@ #ifndef QT_NO_PRINTER # define QT_NO_PRINTER #endif +#ifndef QT_NO_CUPS +# define QT_NO_CUPS +#endif /* Qt for Embedded Linux */ #ifndef QT_NO_QWSEMBEDWIDGET diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index f0b95fe45c..0c0e6aa01a 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -196,6 +196,9 @@ #ifndef QT_NO_PRINTER # define QT_NO_PRINTER #endif +#ifndef QT_NO_CUPS +# define QT_NO_CUPS +#endif /* Qt for Embedded Linux */ #ifndef QT_NO_QWS_SOUNDSERVER diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index d0774c55d6..54c1be8bd3 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -512,8 +512,8 @@ #endif // Common UNIX Printing System -#if !defined(QT_NO_PRINTER) && defined(QT_NO_LIBRARY) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -#define QT_NO_PRINTER +#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) +#define QT_NO_CUPS #endif // QErrorMessage diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 061793caa7..a8547a3ab8 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -451,6 +451,7 @@ class QDataStream; #if defined(Q_OS_VXWORKS) # define QT_NO_CRASHHANDLER // no popen # define QT_NO_PROCESS // no exec*, no fork +# define QT_NO_LPR # define QT_NO_SHAREDMEMORY // only POSIX, no SysV and in the end... # define QT_NO_SYSTEMSEMAPHORE // not needed at all in a flat address space #endif |