Query the screen physical size rather than assuming fixed dpi of 96
authorSean Harmer <sean.harmer.qnx@kdab.com>
Tue, 24 Apr 2012 13:33:23 +0000 (14:33 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 7 May 2012 00:18:56 +0000 (02:18 +0200)
Change-Id: I405e8d1cfbf7f0607f8525f9c8c93053109478d9
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/plugins/platforms/qnx/qqnxscreen.cpp

index ea0c9e3..25a1204 100644 (file)
@@ -91,16 +91,7 @@ QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display,
         qFatal("QQnxScreen: failed to query display physical size, errno=%d", errno);
     }
 
-    // Peg the DPI to 96 (for now) so fonts are a reasonable size. We'll want to match
-    // everything with a QStyle later, and at that point the physical size can be used
-    // instead.
-    {
-        static const int dpi = 96;
-        int width = m_currentGeometry.width() / dpi * qreal(25.4) ;
-        int height = m_currentGeometry.height() / dpi * qreal(25.4) ;
-
-        m_currentPhysicalSize = m_initialPhysicalSize = QSize(width,height);
-    }
+    m_currentPhysicalSize = m_initialPhysicalSize = QSize(val[0], val[1]);
 
     // We only create the root window if we are the primary display.
     if (primaryScreen)