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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 90aff47c86..404aa06399 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -246,9 +246,6 @@ void tst_QPrinterInfo::testForDefaultPrinter() void tst_QPrinterInfo::testForPrinters() { -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) - QSKIP("Test doesn't work on Unix, plugin not yet enabled"); -# endif #if defined(Q_OS_UNIX) || defined(Q_OS_WIN32) # ifdef Q_OS_WIN32 if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { |