diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:58:24 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:59:59 +0100 |
commit | b36c5bdc30040b5100da2a003056d3519972e178 (patch) | |
tree | 952e951bef0add6ee0ff0046c018d663568f9953 /src/plugins/platforms/xcb/qxcbscreen.h | |
parent | 47869340b97686a4bf852f94edc3bae1e50d7053 (diff) | |
parent | c9d18d4a9c9d1243a267316e2a702f9ba69de2fd (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12.0
Conflicts:
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/xcb/qxcbscreen.h
Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979
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 4404a04f49..7f22a8e4db 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -134,7 +134,7 @@ private: QString m_windowManagerName; QMap<xcb_visualid_t, xcb_visualtype_t> m_visuals; QMap<xcb_visualid_t, quint8> m_visualDepths; - uint16_t m_rotation = XCB_RANDR_ROTATION_ROTATE_0; + uint16_t m_rotation = 0; }; class Q_XCB_EXPORT QXcbScreen : public QXcbObject, public QPlatformScreen |