summaryrefslogtreecommitdiffstats
path: root/src/plugins/printsupport
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/printsupport')
-rw-r--r--src/plugins/printsupport/CMakeLists.txt3
-rw-r--r--src/plugins/printsupport/cups/CMakeLists.txt3
-rw-r--r--src/plugins/printsupport/cups/qcupsprintersupport.cpp7
3 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt
index 6d265f9285..dcf3c200d7 100644
--- a/src/plugins/printsupport/CMakeLists.txt
+++ b/src/plugins/printsupport/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
# Generated from printsupport.pro.
if(QT_FEATURE_cups AND UNIX AND NOT APPLE)
diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt
index 1132ff0845..419387b9fd 100644
--- a/src/plugins/printsupport/cups/CMakeLists.txt
+++ b/src/plugins/printsupport/cups/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
# Generated from cups.pro.
qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
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;