diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
| commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
| tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /src/plugins/printsupport/cups/qcupsprintersupport.cpp | |
| parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'src/plugins/printsupport/cups/qcupsprintersupport.cpp')
| -rw-r--r-- | src/plugins/printsupport/cups/qcupsprintersupport.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp index 19e1df31f6..42a7a821f2 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -175,6 +175,11 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const QString QCupsPrinterSupport::defaultPrintDeviceId() const { + return staticDefaultPrintDeviceId(); +} + +QString QCupsPrinterSupport::staticDefaultPrintDeviceId() +{ QString printerId; cups_dest_t *dests; int count = cupsGetDests(&dests); |