diff options
author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
---|---|---|
committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
commit | 6855df6110eebdbfc43211f20dd65f446ccda209 (patch) | |
tree | dd731afb046463a7dcbe249f7ea9de0484195b2a /src/gui/styles/qs60style_simulated.cpp | |
parent | 835a23891567831cf184e5bbaba8d00bfc912699 (diff) | |
parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
download | Qt-6855df6110eebdbfc43211f20dd65f446ccda209.zip Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.gz Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.bz2 |
Merge remote branch 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/qs60style_simulated.cpp')
-rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index 706b4e9..4317483 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -308,16 +308,6 @@ QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size, return result; } -void QS60StylePrivate::setStyleProperty_specific(const char *name, const QVariant &value) -{ - setStyleProperty(name, value); -} - -QVariant QS60StylePrivate::styleProperty_specific(const char *name) const -{ - return styleProperty(name); -} - QPixmap QS60StylePrivate::backgroundTexture() { if (!m_background) { |