From 54a1a94be3b89cbf3d288e0fddf0fb14798fce80 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 12 May 2020 15:08:55 +0200 Subject: Update 'dev' dependencies Along with compile fixes Change-Id: I7fc6397df83d485fbc4714ead16e74bfd079c90f Reviewed-by: Alexandru Croitor --- src/controls/Private/qquickstyleitem.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index fa51c4a3..20d89356 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1041,8 +1041,7 @@ QSize QQuickStyleItem1::sizeFromContents(int width, int height) case MenuItem: case ComboBoxItem: if (static_cast(m_styleoption)->menuItemType == QStyleOptionMenuItem::Scroller) { - size.setHeight(qMax(QApplication::globalStrut().height(), - qApp->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, 0))); + size.setHeight(qApp->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, 0)); } else { size = qApp->style()->sizeFromContents(QStyle::CT_MenuItem, m_styleoption, QSize(width,height)); } -- cgit v1.2.1