diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 08:40:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 08:40:45 +0100 |
| commit | a5ea2f7e9928c651319f8133eeb0fcc9fe6df6fb (patch) | |
| tree | 761528101bd2df4dffdd6504ee24a1acabeba8d2 /src/widgets/widgets/qcalendarwidget.cpp | |
| parent | 291b3cebb905c3924eefa1e5a7c6ac31ca89aacd (diff) | |
| parent | 875420f1c29f0d5e66b4dcacbe95d31dd5dca585 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ibe5b4aa249863a54007180f3684dc5ce1b23cb7b
Diffstat (limited to 'src/widgets/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index fe1133c6c7..570ec72377 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2232,7 +2232,9 @@ QSize QCalendarWidget::minimumSizeHint() const int rows = 7; int cols = 8; - const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1) * 2; + QStyleOption option; + option.initFrom(this); + const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin, &option) + 1) * 2; if (horizontalHeaderFormat() == QCalendarWidget::NoHorizontalHeader) { rows = 6; |