diff options
| author | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2015-04-21 16:11:20 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2015-04-21 23:18:50 +0000 |
| commit | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (patch) | |
| tree | 58c1598215ac4d685f136277773bdb206f582bb1 /src | |
| parent | 4c96367410500c1b373a78cc3b5c6e07e8c998a5 (diff) | |
| download | qtbase-628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59.tar.gz | |
Fix "Unsupported extension used" error
This error message was a result of calling *_randr_* functions
in QXcbWindow::updateGeometry without checking if the X server
provides the XRandR extension.
Change-Id: I165f201c32ca0f4976f9ff9b9f17323098940511
Task-number: QTBUG-45624
Task-number: QTBUG-45388
Task-number: QTBUG-45312
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Jan Kundrát <jkt@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index bcaa13eb1e..a0d6d88d11 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -468,6 +468,9 @@ void QXcbScreen::handleScreenChange(xcb_randr_screen_change_notify_event_t *chan void QXcbScreen::updateGeometry(xcb_timestamp_t timestamp) { + if (!connection()->hasXRandr()) + return; + xcb_randr_get_crtc_info_cookie_t crtcCookie = xcb_randr_get_crtc_info_unchecked(xcb_connection(), m_crtc, timestamp); xcb_randr_get_crtc_info_reply_t *crtc = |