diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:49 +0100 |
| commit | 7917dfbf1c54150d0ca3a79285767c22e6f9d770 (patch) | |
| tree | a05973334097df480afe32d07db42f381b460e74 /src/printsupport/kernel | |
| parent | b9362903b339e57362a7a3296904504521d0e26f (diff) | |
| parent | b088e4827f427189334e8a1c5b4f2b8b0b713fc2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
Diffstat (limited to 'src/printsupport/kernel')
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 5eb840c52a..f23708045d 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -92,7 +92,7 @@ static const float qt_paperSizes[][2] = { {125, 176}, // B6 {88, 125}, // B7 {62, 88}, // B8 - {33, 62}, // B9 + {44, 62}, // B9 {163, 229}, // C5E {105, 241}, // US Common {110, 220}, // DLE @@ -448,7 +448,7 @@ void QPrinterPrivate::setProperty(QPrintEngine::PrintEnginePropertyKey key, cons \value B6 125 x 176 mm \value B7 88 x 125 mm \value B8 62 x 88 mm - \value B9 33 x 62 mm + \value B9 44 x 62 mm \value B10 31 x 44 mm \value C5E 163 x 229 mm \value Comm10E 105 x 241 mm, U.S. Common 10 Envelope |