diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-12 15:08:55 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-12 17:44:18 +0200 |
| commit | 54a1a94be3b89cbf3d288e0fddf0fb14798fce80 (patch) | |
| tree | 3ef3cc5433e9bedda44cec0280766febf01822c8 /src | |
| parent | c7e7fe1f56852863217e052224e80464c9c0fdb8 (diff) | |
| download | qtquickcontrols-54a1a94be3b89cbf3d288e0fddf0fb14798fce80.tar.gz | |
Update 'dev' dependencies
Along with compile fixes
Change-Id: I7fc6397df83d485fbc4714ead16e74bfd079c90f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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<QStyleOptionMenuItem *>(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)); } |