diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 1 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 26c7d548bc..e0a11380d1 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -364,6 +364,7 @@ QVariant QWindowsIntegration::styleHint(QPlatformIntegration::StyleHint hint) co case QPlatformIntegration::StartDragDistance: case QPlatformIntegration::KeyboardInputInterval: case QPlatformIntegration::ShowIsFullScreen: + case QPlatformIntegration::PasswordMaskDelay: break; // Not implemented case QPlatformIntegration::FontSmoothingGamma: return QVariant(QWindowsFontDatabase::fontSmoothingGamma()); diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index cb69d0400f..a10dc1ccd4 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -115,6 +115,7 @@ int QPageSetupDialog::exec() multiplier = 1; break; case QLocale::ImperialSystem: + case QLocale::ImperialUKSystem: psd.Flags |= PSD_INTHOUSANDTHSOFINCHES; multiplier = 25.4/10; break; |