diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:38:17 +0100 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:38:17 +0100 |
| commit | e9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch) | |
| tree | cc9fc9c931423674081b6ab843d22bc643a5df64 /src/qt3support | |
| parent | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff) | |
| parent | a2a3adf7de2ffc9784fea177a43f3124862a992a (diff) | |
| download | qt4-tools-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz | |
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'src/qt3support')
| -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 830dd908f5..4f1603b2ab 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: |