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.cpp | |
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.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 35e90e4206..57dbdc9bec 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -112,13 +112,6 @@ QXcbVirtualDesktop::QXcbVirtualDesktop(QXcbConnection *connection, xcb_screen_t xcb_depth_next(&depth_iterator); } - - if (connection->hasXRandr()) { - xcb_connection_t *conn = connection->xcb_connection(); - auto screen_info = Q_XCB_REPLY(xcb_randr_get_screen_info, conn, screen->root); - if (screen_info) - m_rotation = screen_info->rotation; - } } QXcbVirtualDesktop::~QXcbVirtualDesktop() |