diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
| commit | dcf9a1f2f20248de0da9549af54bc3a4844eaf5b (patch) | |
| tree | c9eee3ff39000816113bcab3a5c035da97c2a9fc /src/gui/styles/qs60style_simulated.cpp | |
| parent | 47712d1f330e4b22ce6dd30e7557288ef7f7fca0 (diff) | |
| parent | 415951891cd75170f1e4b89b46effa3319b56e4e (diff) | |
| download | Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.zip Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.gz Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'src/gui/styles/qs60style_simulated.cpp')
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index 77e0d0e..a5aeac3 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -308,7 +308,7 @@ QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size, return result; } -QPixmap QS60StylePrivate::backgroundTexture() +QPixmap QS60StylePrivate::backgroundTexture(bool /*skipCreation*/) { if (!m_background) { const QSize size = QApplication::desktop()->screen()->size(); @@ -318,11 +318,6 @@ QPixmap QS60StylePrivate::backgroundTexture() return *m_background; } -QSize QS60StylePrivate::naviPaneSize() -{ - return QSize(0, 0); -} - bool QS60StylePrivate::isTouchSupported() { #ifdef QT_KEYPAD_NAVIGATION |