summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pyrkosz <pyrkosz@o2.pl>2016-02-16 00:26:48 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2016-02-16 00:27:29 (GMT)
commit14c936ea1b0a9094b476da45160ebb23614f3a39 (patch)
tree15753eede7e3bb8e8cf8855babbad32227379f2b
parenta704fbce94b6949c3a583ca8f28c63cb86638966 (diff)
Fix for CUPS printing
Okular was checking for Q_WS_X11 definition (which is not available since Qt 5) to detect CUPS, so detection always fails making CUPS parameters ignored. REVIEW: 127036
-rw-r--r--core/fileprinter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index 2c8b199..9287293 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -233,7 +233,7 @@ bool FilePrinter::pdf2psAvailable()
bool FilePrinter::cupsAvailable()
{
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
// Ideally we would have access to the private Qt method
// QCUPSSupport::cupsAvailable() to do this as it is very complex routine.
// However, if CUPS is available then QPrinter::numCopies() will always return 1