1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CUPS: Add support for accessible IPP printers"

Browse Source 
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>
This commit is contained in:
Volker Hilsheimer 2022-07-28 16:31:18 +02:00
parent f7d42e6b0c
commit f387bb55d4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/printsupport/cups/qcupsprintersupport.cpp
View File

@ -129,12 +129,9 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const
list.reserve(count); list.reserve(count);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
QString printerId = QString::fromLocal8Bit(dests[i].name); QString printerId = QString::fromLocal8Bit(dests[i].name);
if (dests[i].instance) { if (dests[i].instance)
printerId += u'/' + QString::fromLocal8Bit(dests[i].instance); printerId += u'/' + QString::fromLocal8Bit(dests[i].instance);
list.append(printerId); list.append(printerId);
} else if (cupsGetOption("printer-uri-supported", dests[i].num_options, dests[i].options)) {
list.append(printerId);
}
} }
cupsFreeDests(count, dests); cupsFreeDests(count, dests);
return list; return list;