diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-20 08:59:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-20 08:59:13 (GMT) |
| commit | 97d57498481598d0d4babfa77f816761dead29b8 (patch) | |
| tree | 8709b1f70c8ad75e225acf476e827cf4e15b85f3 /src/gui/styles/qs60style_simulated.cpp | |
| parent | 0edbaca5e7b718bb9bbbeaccc9e322b525b4327e (diff) | |
| parent | 6037cb7f68fe0dec52f922d9e2f18c8e12a396cb (diff) | |
| download | Qt-97d57498481598d0d4babfa77f816761dead29b8.zip Qt-97d57498481598d0d4babfa77f816761dead29b8.tar.gz Qt-97d57498481598d0d4babfa77f816761dead29b8.tar.bz2 | |
Merge branch '4.7-upstream' 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 |