1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix server buffer integration override logic

Browse Source 
Assign to the actual variable instead of a new one with the same name.

Change-Id: I9e4c3525891ff53f0194198b9c11f223df4c14a9
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Paul Olav Tvete 2017-09-08 11:33:20 +02:00
parent f35dc39ae9
commit 1a0939a8de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -359,7 +359,7 @@ void QWaylandIntegration::initializeServerBufferIntegration()
disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration(); disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration();
if (disableHardwareIntegration) { if (disableHardwareIntegration) {
QByteArray serverBufferIntegrationName = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION"); QByteArray serverBufferIntegrationName = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION");
QString targetKey = QString::fromLocal8Bit(serverBufferIntegrationName); targetKey = QString::fromLocal8Bit(serverBufferIntegrationName);
} else { } else {
targetKey = mDisplay->hardwareIntegration()->serverBufferIntegration(); targetKey = mDisplay->hardwareIntegration()->serverBufferIntegration();
} }