summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbconnection_basic.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-10-30 00:49:20 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-10-30 00:49:20 +0100
commit5f3518d0bfbf5018d2a56c4157cd1163be5489b5 (patch)
treeef9fec3409793ac4d5a17e745220fb7674ab411e /src/plugins/platforms/xcb/qxcbconnection_basic.cpp
parente02d758c9509de31aafc82d53296f1acdab55151 (diff)
parent58d2180dfac2e279b7fae89d467b16d82d80eb7e (diff)
Merge 5.12 into 5.12.0
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection_basic.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_basic.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp
index 7bed3c8937..b8335d1240 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp
@@ -308,7 +308,7 @@ void QXcbBasicConnection::initializeXRandr()
return;
}
- m_hasXRender = true;
+ m_hasXRandr = true;
m_xrenderVersion.first = xrenderQuery->major_version;
m_xrenderVersion.second = xrenderQuery->minor_version;
#endif
@@ -358,7 +358,7 @@ void QXcbBasicConnection::initializeXRender()
return;
}
- m_hasXRandr = true;
+ m_hasXRender = true;
m_xrandrFirstEvent = reply->first_event;
}