diff options
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintersupport.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qprintengine_mac.mm | 4 | ||||
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp | 15 |
3 files changed, 3 insertions, 18 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.mm b/src/plugins/platforms/cocoa/qcocoaprintersupport.mm index 6653c81a4a..a6eb5ddeb8 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.mm +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.mm @@ -108,7 +108,7 @@ QList<QPrinterInfo> QCocoaPrinterSupport::availablePrinters() CFIndex count = CFArrayGetCount(printerList); for (CFIndex i = 0; i < count; ++i) { PMPrinter printer = static_cast<PMPrinter>(const_cast<void *>(CFArrayGetValueAtIndex(printerList, i))); - QString printerName = QCFString::toQString(PMPrinterGetName(printer)); + QString printerName = QCFString::toQString(PMPrinterGetID(printer)); returnValue += QPlatformPrinterSupport::printerInfo(printerName, PMPrinterIsDefault(printer)); } } diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm index 921dd2f78f..7921832555 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm @@ -626,7 +626,7 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va CFIndex count = CFArrayGetCount(printerList); for (CFIndex i=0; i<count; ++i) { PMPrinter printer = static_cast<PMPrinter>(const_cast<void *>(CFArrayGetValueAtIndex(printerList, i))); - QString name = QCFString::toQString(PMPrinterGetName(printer)); + QString name = QCFString::toQString(PMPrinterGetID(printer)); if (name == value.toString()) { status = PMSessionSetCurrentPMPrinter(d->session(), printer); printerNameSet = true; @@ -777,7 +777,7 @@ QVariant QMacPrintEngine::property(PrintEnginePropertyKey key) const if (status != noErr) qWarning("QMacPrintEngine::printerName: Failed getting current PMPrinter: %ld", long(status)); if (printer) - ret = QCFString::toQString(PMPrinterGetName(printer)); + ret = QCFString::toQString(PMPrinterGetID(printer)); break; } case PPK_Resolution: { ret = d->resolution.hRes; diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 404aa06399..70a00edb10 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -70,7 +70,6 @@ private slots: void testAssignment(); private: - void macFixNameFormat(QString *printerName); QString getDefaultPrinterFromSystem(); QStringList getPrintersFromSystem(); @@ -86,18 +85,6 @@ void tst_QPrinterInfo::initTestCase() #else -void tst_QPrinterInfo::macFixNameFormat(QString *printerName) -{ -// Modify the format of the printer name to match Qt, lpstat returns -// foo___domain_no, Qt returns foo @ domain.no -#ifdef Q_OS_MAC - printerName->replace(QLatin1String("___"), QLatin1String(" @ ")); - printerName->replace(QLatin1String("_"), QLatin1String(".")); -#else - Q_UNUSED(printerName); -#endif -} - QString tst_QPrinterInfo::getDefaultPrinterFromSystem() { QStringList command; @@ -113,7 +100,6 @@ QString tst_QPrinterInfo::getDefaultPrinterFromSystem() QRegExp defaultReg("default.*: *([a-zA-Z0-9_-]+)"); defaultReg.indexIn(output); QString printer = defaultReg.cap(1); - macFixNameFormat(&printer); return printer; } @@ -130,7 +116,6 @@ QStringList tst_QPrinterInfo::getPrintersFromSystem() for (int c = 0; c < list.size(); ++c) { if (reg.indexIn(list[c]) >= 0) { QString printer = reg.cap(1); - macFixNameFormat(&printer); ans << printer; } } |