diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-19 19:31:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-19 19:34:53 +0100 |
| commit | d4a29a53ebfb78a9acf5e6f34b6f0721d02f8727 (patch) | |
| tree | 92436a56de0f549b29d3b75df855775fc7a21331 /src/plugins/platforms/xcb/qxcbscreen.h | |
| parent | 234163adb3ceb9a6f2fac04a276724bf8495ca8e (diff) | |
| parent | d1c10615e31acc487eae0c966e8c3a8e5927af84 (diff) | |
Merge 'release' into stable
Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbscreen.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index d9eee464dc..96d30cde8b 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -96,6 +96,7 @@ public: void updateGeometry(xcb_timestamp_t timestamp); void updateRefreshRate(); + void readXResources(); private: xcb_screen_t *m_screen; xcb_randr_crtc_t m_crtc; @@ -114,6 +115,7 @@ private: QMap<xcb_visualid_t, xcb_visualtype_t> m_visuals; QXcbCursor *m_cursor; int m_refreshRate; + int m_forcedDpi; }; QT_END_NAMESPACE |