diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-24 15:26:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-24 15:26:10 (GMT) |
| commit | 270c374c178ec5a532d37168b018cd7ebc844558 (patch) | |
| tree | a1f3b19daae4a40c296f127b0f8af64107c2c29a /src/gui/styles | |
| parent | 4d593220a8521c75821609560a3f7e09e28988c5 (diff) | |
| parent | 9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff) | |
| download | Qt-270c374c178ec5a532d37168b018cd7ebc844558.zip Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.gz Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
examples/webkit/formextractor/formextractor.pro
mkspecs/features/qt.prf
src/gui/painting/qpaintengineex.cpp
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qwindowsxpstyle.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp index 9c374d8..9ef30e5 100644 --- a/src/gui/styles/qwindowsxpstyle.cpp +++ b/src/gui/styles/qwindowsxpstyle.cpp @@ -3299,17 +3299,6 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con } break; - case PM_MenuButtonIndicator: - { - XPThemeData theme(widget, 0, QLatin1String("TOOLBAR"), TP_SPLITBUTTONDROPDOWN); - if (theme.isValid()) { - SIZE size; - pGetThemePartSize(theme.handle(), 0, theme.partId, theme.stateId, 0, TS_TRUE, &size); - res = size.cx; - } - } - break; - case PM_TitleBarHeight: { #ifdef QT3_SUPPORT |