diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 14:16:24 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 14:16:24 (GMT) |
| commit | 0dfb4c79dd6fb23fea5277c687485d43b0f91e3f (patch) | |
| tree | a921b61578cfca0e2fff7ed074819294988ebae2 /src/gui/painting/qpaintdevice.h | |
| parent | 0c30418556d978f730c33aa3bb066961981ccc9b (diff) | |
| parent | 7fecd890ce50d86120566acc7e71fcac915a671f (diff) | |
| download | Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.zip Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.tar.gz Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/painting/qpaintdevice.h')
| -rw-r--r-- | src/gui/painting/qpaintdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index 9148e4b..0f8191e 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -96,7 +96,9 @@ public: int logicalDpiY() const { return metric(PdmDpiY); } int physicalDpiX() const { return metric(PdmPhysicalDpiX); } int physicalDpiY() const { return metric(PdmPhysicalDpiY); } +#ifdef QT_DEPRECATED QT_DEPRECATED int numColors() const { return metric(PdmNumColors); } +#endif int colorCount() const { return metric(PdmNumColors); } int depth() const { return metric(PdmDepth); } |