diff options
| author | David Edmundson <davidedmundson@kde.org> | 2013-12-03 12:25:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 12:54:40 +0100 |
| commit | 4746541dcfebb73ea8398e60e046e394ea9fa441 (patch) | |
| tree | 1b06fd06f66b687a30dfe2b09e81b273190b19f9 | |
| parent | c669f95302fecb4b21d3b658d3b1d42efb3cc7e8 (diff) | |
| download | qtquickcontrols-4746541dcfebb73ea8398e60e046e394ea9fa441.tar.gz | |
Pass a valid style option to fetch default frame width
This is useful for oxygen to return the correct size
Change-Id: I0476f89f68eabf4c1a8611623095213c8f70cef2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 566a46f8..4b8d71f2 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1064,7 +1064,7 @@ int QQuickStyleItem::pixelMetric(const QString &metric) if (metric == "scrollbarExtent") return qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0 ); else if (metric == "defaultframewidth") - return qApp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0); + return qApp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, m_styleoption); else if (metric == "taboverlap") return qApp->style()->pixelMetric(QStyle::PM_TabBarTabOverlap, 0 ); else if (metric == "tabbaseoverlap") |