diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
| commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
| tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /src/printsupport | |
| parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
| parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 5da87cce18..fd3a676369 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -137,9 +137,8 @@ int QPageSetupDialog::exec() QDialog::setVisible(false); if (result) { engine->setGlobalDevMode(psd.hDevNames, psd.hDevMode); - d->printer->setPageMargins(QMarginsF(psd.rtMargin.left / multiplier, psd.rtMargin.right / multiplier, - psd.rtMargin.top / multiplier, psd.rtMargin.bottom / multiplier), - layout.units()); + const QMarginsF margins(psd.rtMargin.left, psd.rtMargin.top, psd.rtMargin.right, psd.rtMargin.bottom); + d->printer->setPageMargins(margins / multiplier, layout.units()); // copy from our temp DEVMODE struct if (!engine->globalDevMode() && hDevMode) { |