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/itemviews/qitemdelegate.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/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 4420d39b8e..40ad48c655 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -1122,7 +1122,7 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect, QSizeF fpSize = d->doTextLayout(rect.width()); const QSize size = QSize(qCeil(fpSize.width()), qCeil(fpSize.height())); // ###: textRectangle should take style option as argument - const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; + const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1; return QRect(0, 0, size.width() + 2 * textMargin, size.height()); } |