diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
commit | 9c84b7786cac7ea1cf1a8a61b503fca4b5553a49 (patch) | |
tree | af018122dac633ad74f8e62bf260d1fb8339982a /src/plugins/platforms/xcb/qxcbscreen.h | |
parent | 18aa8390ce83b4aa9cabe5609b8f830f86e475e5 (diff) | |
parent | 63a3b26b6b2dae88a44ad6a4917563b5331823d6 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/plugins/platforms/xcb/qxcbscreen.h
src/src.pro
Change-Id: I4e1981e69a1ddcbe4078ec6ab2a64b0da6a445de
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbscreen.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index 62931d2500..79698b4ef3 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -226,7 +226,7 @@ private: QRect m_availableGeometry; Qt::ScreenOrientation m_orientation = Qt::PrimaryOrientation; QXcbCursor *m_cursor; - int m_refreshRate = 60; + qreal m_refreshRate = 60.0; QEdidParser m_edid; }; |