diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-28 16:31:18 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-28 20:50:18 +0200 |
| commit | f387bb55d4060c6bfac0cd6da736c80dd9a47066 (patch) | |
| tree | c8ed437c9fbbd50090d2adcde10f26cefd1eb9ca /src/plugins/printsupport | |
| parent | f7d42e6b0cc0c17ead916fecaca932f65cecff86 (diff) | |
Revert "CUPS: Add support for accessible IPP printers"
This reverts commit 2f5f276b4a2a19b9f2669b84f28ce8e970aaa39f,
after which valid printers are no longer listed anymore.
Fixes: QTBUG-105242
Pick-to: 6.2 6.3 6.4 5.15
Change-Id: I6a388acff2a8033ad1052319edcf7e41a2f72c8f
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'src/plugins/printsupport')
| -rw-r--r-- | src/plugins/printsupport/cups/qcupsprintersupport.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp index c8077bdbf1..539cd55c54 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -129,12 +129,9 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const list.reserve(count); for (int i = 0; i < count; ++i) { QString printerId = QString::fromLocal8Bit(dests[i].name); - if (dests[i].instance) { + if (dests[i].instance) printerId += u'/' + QString::fromLocal8Bit(dests[i].instance); - list.append(printerId); - } else if (cupsGetOption("printer-uri-supported", dests[i].num_options, dests[i].options)) { - list.append(printerId); - } + list.append(printerId); } cupsFreeDests(count, dests); return list; |