diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
| commit | 05c1b075f757afcc87748ac6758277eb5c0d8e17 (patch) | |
| tree | 9f3159998e643ccd96313c94fb5eac2782aa3aab /src/qt3support/painting/q3paintdevicemetrics.h | |
| parent | 87845845cd5b44bc4ad391ad5ae8499f3850acb3 (diff) | |
| parent | db3ae6188c8f88f25b4f8e2645e76a7c6fffef18 (diff) | |
| download | Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.zip Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.gz Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/qt3support/painting/q3paintdevicemetrics.h')
| -rw-r--r-- | src/qt3support/painting/q3paintdevicemetrics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/painting/q3paintdevicemetrics.h b/src/qt3support/painting/q3paintdevicemetrics.h index 830dd90..4f1603b 100644 --- a/src/qt3support/painting/q3paintdevicemetrics.h +++ b/src/qt3support/painting/q3paintdevicemetrics.h @@ -63,7 +63,7 @@ public: int logicalDpiY() const { return pdev->logicalDpiY(); } int physicalDpiX() const { return pdev->physicalDpiX(); } int physicalDpiY() const { return pdev->physicalDpiY(); } - int numColors() const { return pdev->numColors(); } + int numColors() const { return pdev->colorCount(); } int depth() const { return pdev->depth(); } private: |