diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
| commit | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (patch) | |
| tree | 9ed5acfa397b093fd726742ae3c478c2f21223bc /src/gui/styles/qs60style_simulated.cpp | |
| parent | 1b4bb02fcb3da77ddfa6281365ba3210aab9daad (diff) | |
| parent | f3da2f414f9fce9aa014da79be9f50c075c60936 (diff) | |
| download | Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.zip Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.gz Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.bz2 | |
Merge remote branch 'qt/4.6' into qt-master-from-4.6
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/gui/styles/qs60style_simulated.cpp')
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index bd43eb7..f87cf28 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -342,6 +342,11 @@ bool QS60StylePrivate::hasSliderGrooveGraphic() return false; } +bool QS60StylePrivate::isSingleClickUi() +{ + return false; +} + QFont QS60StylePrivate::s60Font_specific( QS60StyleEnums::FontCategories fontCategory, int pointSize, bool resolveFontSize) @@ -364,6 +369,11 @@ QFont QS60StylePrivate::s60Font_specific( return result; } +int QS60StylePrivate::currentAnimationFrame(QS60StyleEnums::SkinParts part) +{ + return 0; +} + /*! Constructs a QS60Style object. */ |