diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-11 11:49:35 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 22:22:34 +0100 |
commit | 1fbe8242ece70fe5aa2b50e9a782ec509b163b78 (patch) | |
tree | 4b2a9c4499fee0534509098a3d0648c70dba1e95 /src/corelib/global/qnamespace.h | |
parent | f65a10b733800f83dae47ce1694fbeaf29ce5b5c (diff) |
QStyleHelper: Base DPI-calculation on QScreen.
- Use qt_defaultDpiX() to obtain the resolution, which
obtains it from QScreen. This implies that for X11,
which previously used a hardcoded default of 96 DPI,
the real resolution will be used (typically 75).
- Since many tests (layouts, graphicsview) contain
test data for 96 DPI, add an attribute to
QCoreApplication making it possible to set the
resolution to 96 DPI for testing.
Change-Id: I77c8233a96b0d75de07406f58d48886a89c3de06
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r-- | src/corelib/global/qnamespace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index f584a26dfc..d3b048579f 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -479,8 +479,7 @@ public: AA_MacPluginApplication = 5, AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, - AA_S60DontConstructApplicationPanes = 8, - AA_S60DisablePartialScreenInputMode = 9, + AA_Use96Dpi = 8, AA_X11InitThreads = 10, // Add new attributes before this line |