1 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
index c8077bdbf1..6578d8a558 100644
--- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp
+++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
@@ -11,14 +11,14 @@
 
 #include <QtPrintSupport/QPrinterInfo>
 
-#if QT_CONFIG(dialogbuttonbox)
+#if QT_CONFIG(cupspassworddialog)
 #include <QGuiApplication>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QLabel>
 #include <QLineEdit>
-#endif // QT_CONFIG(dialogbuttonbox)
+#endif // QT_CONFIG(cupspassworddialog)
 
 #include <cups/ppd.h>
 #ifndef QT_LINUXBASE // LSB merges everything into cups.h
@@ -27,7 +27,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if QT_CONFIG(dialogbuttonbox)
+#if QT_CONFIG(cupspassworddialog)
 static const char *getPasswordCB(const char */*prompt*/, http_t *http, const char */*method*/, const char *resource, void */*user_data*/)
 {
     // cups doesn't free the const char * we return so keep around
@@ -57,7 +57,7 @@ static const char *getPasswordCB(const char */*prompt*/, http_t *http, const cha
 
     QString resourceString = QString::fromLocal8Bit(resource);
     if (resourceString.startsWith(QStringLiteral("/printers/")))
-        resourceString = resourceString.mid(QStringLiteral("/printers/").length());
+        resourceString = resourceString.mid(QStringLiteral("/printers/").size());
 
     QLabel *label = new QLabel();
     if (hostname == QStringLiteral("localhost")) {
@@ -89,16 +89,16 @@ static const char *getPasswordCB(const char */*prompt*/, http_t *http, const cha
 
     return password.constData();
 }
-#endif // QT_CONFIG(dialogbuttonbox)
+#endif // QT_CONFIG(cupspassworddialog)
 
 QCupsPrinterSupport::QCupsPrinterSupport()
     : QPlatformPrinterSupport()
 {
-#if QT_CONFIG(dialogbuttonbox)
+#if QT_CONFIG(cupspassworddialog)
     // Only show password dialog if GUI application
     if (qobject_cast<QGuiApplication*>(QCoreApplication::instance()))
         cupsSetPasswordCB2(getPasswordCB, nullptr /* user_data */ );
-#endif // QT_CONFIG(dialogbuttonbox)
+#endif // QT_CONFIG(cupspassworddialog)
 }
 
 QCupsPrinterSupport::~QCupsPrinterSupport()
@@ -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;