diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:13:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:14:15 +0100 |
| commit | 846cc4c75cc06def67e831c8cb3c9edaef24f8f0 (patch) | |
| tree | cf8cd76a5a610a6264583148b2c0549f7514dde3 /src/plugins/printsupport/windows/qwindowsprintersupport.cpp | |
| parent | 9e4a215a2569a04010292c8718d0f0569bc06c12 (diff) | |
| parent | 0d0fb04d505d105fb4b2fc71d68f729ce670b12e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91
Diffstat (limited to 'src/plugins/printsupport/windows/qwindowsprintersupport.cpp')
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintersupport.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp index 2faebf6f64..b7ba9ef5e7 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp @@ -101,9 +101,7 @@ QList<QPrinterInfo> QWindowsPrinterSupport::queryPrinters() return result; PPRINTER_INFO_4 infoList = reinterpret_cast<PPRINTER_INFO_4>(buffer.data()); QString defaultPrinterName; - QString program; - QString port; - QWin32PrintEngine::queryDefaultPrinter(defaultPrinterName, program, port); + QWin32PrintEngine::queryDefaultPrinter(defaultPrinterName); for (uint i = 0; i < returned; ++i) { const QString printerName(QString::fromWCharArray(infoList[i].pPrinterName)); const bool isDefault = (printerName == defaultPrinterName); |