diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-28 07:26:23 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-28 07:26:23 (GMT) |
| commit | b4e121fdae6667c1e7fc2fb8e829688b6a64a10f (patch) | |
| tree | c4e3a5ca7ec34f122e071c0de843daa457357c42 | |
| parent | ec081e992b1c8588bd08fef677fe090f6fe5c693 (diff) | |
| parent | 2f42ad94f671d50568afa2a1d0ef82e921cc73a0 (diff) | |
| download | Qt-b4e121fdae6667c1e7fc2fb8e829688b6a64a10f.zip Qt-b4e121fdae6667c1e7fc2fb8e829688b6a64a10f.tar.gz Qt-b4e121fdae6667c1e7fc2fb8e829688b6a64a10f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/text/qfont.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 4d316f6..930e8af 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -173,8 +173,7 @@ Q_GUI_EXPORT int qt_defaultDpiX() screen = subScreens.at(0); dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4))); #elif defined(Q_WS_S60) - const TReal inchWidth = (TReal)S60->screenWidthInTwips / KTwipsPerInch; - dpi = S60->screenWidthInPixels / inchWidth; + dpi = S60->defaultDpiX; #endif // Q_WS_X11 return dpi; @@ -202,8 +201,7 @@ Q_GUI_EXPORT int qt_defaultDpiY() screen = subScreens.at(0); dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4))); #elif defined(Q_WS_S60) - const TReal inchHeight = (TReal)S60->screenHeightInTwips / KTwipsPerInch; - dpi = S60->screenHeightInPixels / inchHeight; + dpi = S60->defaultDpiY; #endif // Q_WS_X11 return dpi; |