diff options
| author | axis <qt-info@nokia.com> | 2011-04-07 09:08:53 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-07 09:08:53 (GMT) |
| commit | d54b3f04fa629fe031f1083073eef0145f0d6b1e (patch) | |
| tree | 2a06736f812c478bdb21aa3781078fe88b5532fa /src/gui/styles/qs60style_p.h | |
| parent | 258c1a8537816f7b4c79e7cf4090a333768a10fa (diff) | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| download | Qt-d54b3f04fa629fe031f1083073eef0145f0d6b1e.zip Qt-d54b3f04fa629fe031f1083073eef0145f0d6b1e.tar.gz Qt-d54b3f04fa629fe031f1083073eef0145f0d6b1e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/corelib/thread/qthread_unix.cpp
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index 3628b27..e146a4e 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -562,8 +562,6 @@ public: void handleSkinChange(); #endif // Q_WS_S60 - static QSize naviPaneSize(); - //Checks that the current brush is transparent or has BrushStyle NoBrush, //so that theme graphic background can be drawn. static bool canDrawThemeBackground(const QBrush &backgroundBrush, const QWidget *widget); |