summaryrefslogtreecommitdiffstats
path: root/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
diff options
context:
space:
mode:
authorJohn Layt <jlayt@kde.org>2012-05-14 20:17:16 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-24 09:48:27 +0200
commit36f469bdb1c705f0082610a4fe9fd88b90accd24 (patch)
treefa96b0b3091d1730966a20d142add5d12d87d400 /src/printsupport/kernel/qplatformprintersupport_qpa.cpp
parentce5c1db2d3db7d7c7af28e9053ca591f76c6101c (diff)
QtPrintSupport - Modify Platform Plugin QPrinterInfo api
Change the way the printsupport plugin creates QPrinterInfo objects, provide platform api to return a named printer, and expose this as static public api in QPrinterInfo. Only the Mac plugin used the old api, the other plugins will have direct support added in separate commits, but will use the default implementation for now. Change-Id: I7d6b6556eb39919cfb15bc0e814afbaf13c5712c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/printsupport/kernel/qplatformprintersupport_qpa.cpp')
-rw-r--r--src/printsupport/kernel/qplatformprintersupport_qpa.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index 9c0c3f131c..35441df5fc 100644
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -97,11 +97,14 @@ QPrinterInfo QPlatformPrinterSupport::defaultPrinter()
return printers.isEmpty() ? QPrinterInfo() : printers.front();
}
-QPrinterInfo QPlatformPrinterSupport::printerInfo(const QString &printerName, bool isDefault)
+QPrinterInfo QPlatformPrinterSupport::printerInfo(const QString &printerName)
{
- QPrinterInfo pi = QPrinterInfo(printerName);
- pi.d_func()->isDefault = isDefault;
- return pi;
+ const QList<QPrinterInfo> printers = availablePrinters();
+ foreach (const QPrinterInfo &printerInfo, printers) {
+ if (printerInfo.printerName() == printerName)
+ return printerInfo;
+ }
+ return QPrinterInfo();
}
void QPlatformPrinterSupport::setPrinterInfoDefault(QPrinterInfo *p, bool isDefault)