diff options
Diffstat (limited to 'src/plugins/platforms')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index c6e3035476..0c26aadc53 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -90,7 +90,7 @@ QSizeF QEglFSAndroidHooks::physicalScreenSize() const QDpi QEglFSAndroidHooks::logicalDpi() const { - qreal lDpi = QtAndroid::scaledDensity() * 100; + qreal lDpi = QtAndroid::scaledDensity() * 72; return QDpi(lDpi, lDpi); } diff --git a/src/plugins/platforms/android/src/qandroidplatformtheme.cpp b/src/plugins/platforms/android/src/qandroidplatformtheme.cpp index 9e08440eed..79fbc440fc 100644 --- a/src/plugins/platforms/android/src/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformtheme.cpp @@ -122,6 +122,11 @@ const QFont *QAndroidPlatformTheme::font(Font type) const QHash<int, QFont>::const_iterator it = m_androidPlatformNativeInterface->m_fonts.find(fontType(type)); if (it != m_androidPlatformNativeInterface->m_fonts.end()) return &(it.value()); + + // default in case the style has not set a font + static QFont systemFont("Roboto", 12.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi + if (type == QPlatformTheme::SystemFont) + return &systemFont; return 0; } diff --git a/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp b/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp index 409c833db3..cf24d68ab5 100644 --- a/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp @@ -72,6 +72,6 @@ QRegion QAndroidPlatformScreen::doRedraw() QDpi QAndroidPlatformScreen::logicalDpi() const { - qreal lDpi = QtAndroid::scaledDensity() * 100; + qreal lDpi = QtAndroid::scaledDensity() * 72; return QDpi(lDpi, lDpi); } |