summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-03-17 16:42:20 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-03-17 16:42:20 +0100
commit85654ad96a6ae1556292ae31392f296e90e25156 (patch)
tree068d4e12362dd79469e860040b969e82c449cc13
parent1fab918af9924bd3f7fc07332319232f8622d25a (diff)
parente6a813c7869fb3677b15b3907bd6647b5f80bd5e (diff)
downloadqtx11extras-85654ad96a6ae1556292ae31392f296e90e25156.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I1e627b4485ff27c4f4e70bab119cd8319bc2d30f
-rw-r--r--src/x11extras/qx11info_x11.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index 4647bd6..8d8f337 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -338,7 +338,7 @@ Display *QX11Info::display()
if (!native)
return NULL;
- void *display = native->nativeResourceForScreen(QByteArray("display"), QGuiApplication::primaryScreen());
+ void *display = native->nativeResourceForIntegration(QByteArray("display"));
return reinterpret_cast<Display *>(display);
}
@@ -355,7 +355,7 @@ xcb_connection_t *QX11Info::connection()
if (!native)
return NULL;
- void *connection = native->nativeResourceForWindow(QByteArray("connection"), 0);
+ void *connection = native->nativeResourceForIntegration(QByteArray("connection"));
return reinterpret_cast<xcb_connection_t *>(connection);
}