diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 22 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.h | 2 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 77fa40f414..366e3bc844 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1828,11 +1828,17 @@ QList<QPrinter::PaperSource> QPrinter::supportedPaperSources() const Any other value implies that the given value should be used. - \warning This function is not available on Windows. + This function always returns an empty string on Windows and Mac. - \sa setPrinterSelectionOption() + \sa setPrinterSelectionOption(), setPrintProgram() */ +QString QPrinter::printerSelectionOption() const +{ + Q_D(const QPrinter); + return d->printEngine->property(QPrintEngine::PPK_SelectionOption).toString(); +} + /*! \fn void QPrinter::setPrinterSelectionOption(const QString &option) @@ -1844,24 +1850,16 @@ QList<QPrinter::PaperSource> QPrinter::supportedPaperSources() const If the printer selection option is changed while the printer is active, the current print job may or may not be affected. - \warning This function is not available on Windows. + This function has no effect on Windows or Mac. - \sa printerSelectionOption() + \sa printerSelectionOption(), setPrintProgram() */ -#ifndef Q_OS_WIN -QString QPrinter::printerSelectionOption() const -{ - Q_D(const QPrinter); - return d->printEngine->property(QPrintEngine::PPK_SelectionOption).toString(); -} - void QPrinter::setPrinterSelectionOption(const QString &option) { Q_D(QPrinter); d->setProperty(QPrintEngine::PPK_SelectionOption, option); } -#endif /*! \since 4.1 diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index d529c06b4d..54047c0c32 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -227,10 +227,8 @@ public: QRectF paperRect(Unit) const; QRectF pageRect(Unit) const; -#if !defined(Q_OS_WIN) || defined(Q_QDOC) QString printerSelectionOption() const; void setPrinterSelectionOption(const QString &); -#endif bool newPage(); bool abort(); |