diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-13 14:08:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 22:18:41 +0200 |
| commit | 9a2dbcab7e820c63aac55ba08dc120a56986efac (patch) | |
| tree | e99a450b0fbb7282fc6ec8c8d1d1a186a515a6bd /src/plugins/printsupport | |
| parent | d3d8ade87b74c541cc3baa67b9972d6471864c25 (diff) | |
| download | qtbase-9a2dbcab7e820c63aac55ba08dc120a56986efac.tar.gz | |
QPrinter/Windows: Fix handling of native paper source ids.
On Windows, it is possible to pass native Windows paper source
ids >= DMBIN_USER to QPrinter::setPaperSource() and they are
listed by supportedPaperSources().
Task-number: QTBUG-38897
Task-number: QTBUG-38888
Change-Id: I8f1264e80ce5bdddd3873602200b24eabee00502
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/plugins/printsupport')
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp index 1b55937ec7..2c75ab7016 100644 --- a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp @@ -78,6 +78,7 @@ static QPrint::InputSlot paperBinToInputSlot(int windowsId, const QString &name) } slot.key = inputSlotMap[i].key; slot.id = inputSlotMap[i].id; + slot.windowsId = windowsId; return slot; } |