diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-07 23:30:02 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-07 23:30:02 (GMT) |
| commit | 3f3e86d6fce5bb781bc41def35d0f15c58ef769c (patch) | |
| tree | f79a0317d168a1961c11c2b8f3b772029e2902e1 /src/gui/embedded/qscreen_qws.h | |
| parent | dbbf451755d34be44f6b7ac2e7c03ffe5528fb1b (diff) | |
| parent | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (diff) | |
| download | Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.zip Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.gz Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/gui/embedded/qscreen_qws.h')
| -rw-r--r-- | src/gui/embedded/qscreen_qws.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/embedded/qscreen_qws.h b/src/gui/embedded/qscreen_qws.h index b3246f9..7ab49fb 100644 --- a/src/gui/embedded/qscreen_qws.h +++ b/src/gui/embedded/qscreen_qws.h @@ -243,7 +243,9 @@ public: int totalSize() const { return mapsize; } QRgb * clut() { return screenclut; } +#ifdef QT_DEPRECATED QT_DEPRECATED int numCols() { return screencols; } +#endif int colorCount() { return screencols; } virtual QSize mapToDevice(const QSize &) const; |