diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 03:49:11 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 03:49:11 (GMT) |
commit | c2e53adcb015e142436127f989b0f219df7ade36 (patch) | |
tree | c91d33f86c3d2a20f40d0a71bf7def1e16ac623a /src/gui | |
parent | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 (diff) | |
parent | cca6d17a40e3435b3e41c09a5eba20f50b28e9ae (diff) | |
download | Qt-c2e53adcb015e142436127f989b0f219df7ade36.zip Qt-c2e53adcb015e142436127f989b0f219df7ade36.tar.gz Qt-c2e53adcb015e142436127f989b0f219df7ade36.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix header labels on mac with rtl
examples/dbus: update remotecontrolledcar example
examples/dbus: update dbus-chat adaptor/interface files
doc: Fix typo in QEvent::ignore() documentation
doc: Fix qmake-manual warn_on/warn_off references
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 083f730..2313ac5 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -4320,8 +4320,6 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, rect.setY(0); rect.setHeight(widget->height()); } - if (opt->direction == Qt::RightToLeft) - rect.adjust(15, 0, -20, 0); } break; case SE_ProgressBarGroove: |