diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-18 13:52:46 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-18 13:52:46 (GMT) |
| commit | 79a7b643231ac690ffeaaa53cc1ff7e8538a3056 (patch) | |
| tree | 87f4988bcfe1d59234882293214829a6fbee0cf5 /src/gui/embedded | |
| parent | ba7927c84e0e1ed4df197e60b1c9eeec8ce1475c (diff) | |
| parent | e581386148a9615ef6c11eb3ae6735d0fa9668f6 (diff) | |
| download | Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.zip Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.tar.gz Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/embedded')
| -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; |