diff options
Diffstat (limited to 'src/printsupport/dialogs')
-rw-r--r-- | src/printsupport/dialogs/dialogs.pri | 1 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 3 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 25 |
3 files changed, 4 insertions, 25 deletions
diff --git a/src/printsupport/dialogs/dialogs.pri b/src/printsupport/dialogs/dialogs.pri index 2b92f43bec..c9acae7767 100644 --- a/src/printsupport/dialogs/dialogs.pri +++ b/src/printsupport/dialogs/dialogs.pri @@ -21,6 +21,7 @@ win32 { } unix:!mac { + INCLUDEPATH += $$QT_SOURCE_TREE/src/plugins/printsupport/cups HEADERS += dialogs/qpagesetupdialog_unix_p.h SOURCES += dialogs/qprintdialog_unix.cpp \ dialogs/qpagesetupdialog_unix.cpp diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index 90fb3ef542..ac8338b739 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -52,11 +52,10 @@ #include <QtPrintSupport/qprinter.h> #include <private/qabstractpagesetupdialog_p.h> #include <private/qprinter_p.h> +#include <private/qprintengine_pdf_p.h> #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) # include <private/qcups_p.h> -# include <cups/cups.h> -# include <private/qprintengine_pdf_p.h> #endif diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 9633c1358e..49d523e2eb 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -52,6 +52,7 @@ #include <QtWidgets/qfilesystemmodel.h> #include <QtWidgets/qstyleditemdelegate.h> #include <QtPrintSupport/qprinter.h> +#include <private/qprintengine_pdf_p.h> #include <QtWidgets/qdialogbuttonbox.h> @@ -62,14 +63,11 @@ #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) # include <private/qcups_p.h> -# include <cups/cups.h> -# include <private/qprintengine_pdf_p.h> #else # include <QtCore/qlibrary.h> +# include <private/qprintengine_pdf_p.h> #endif -#include <private/qprinterinfo_unix_p.h> - QT_BEGIN_NAMESPACE class QOptionTreeItem; @@ -165,7 +163,6 @@ public: Ui::QPrintWidget widget; QAbstractPrintDialog * q; QPrinter *printer; - QList<QPrinterDescription> lprPrinters; void updateWidget(); private: @@ -664,14 +661,6 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p) widget.properties->setEnabled(true); } currentPrinterIndex = cups->currentPrinterIndex(); - } else { -#endif - currentPrinterIndex = qt_getLprPrinters(lprPrinters); - // populating printer combo - QList<QPrinterDescription>::const_iterator i = lprPrinters.constBegin(); - for(; i != lprPrinters.constEnd(); ++i) - widget.printers->addItem((*i).name); -#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) } #endif @@ -783,16 +772,6 @@ void QUnixPrintWidgetPrivate::_q_printerChanged(int index) } else { if (optionsPane) optionsPane->selectPrinter(0); -#endif - if (lprPrinters.count() > 0) { - QString type = lprPrinters.at(index).name + QLatin1Char('@') + lprPrinters.at(index).host; - if (!lprPrinters.at(index).comment.isEmpty()) - type += QLatin1String(", ") + lprPrinters.at(index).comment; - widget.type->setText(type); - if (propertiesDialog) - propertiesDialog->selectPrinter(); - } -#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) } #endif } |