diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-27 14:30:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-27 15:10:13 +0200 |
| commit | ef69b4d772304efcc3b9141900f4e76642d4873b (patch) | |
| tree | be32cebe5d78f424fba33808966982312998a277 /src/client/qwaylandintegration.cpp | |
| parent | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (diff) | |
| parent | ffee1b3fb8c8e76d9317547376c8f13b0e17b494 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/client/qwaylandwindow.cpp
src/client/qwaylandwindow_p.h
src/compositor/compositor_api/qwaylandpointer.cpp
Change-Id: Icbc22a1ae3cdd9cde438742817d07fccf97f647b
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 03aedd6b6..34845c639 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -359,7 +359,7 @@ void QWaylandIntegration::initializeServerBufferIntegration() disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration(); if (disableHardwareIntegration) { QByteArray serverBufferIntegrationName = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION"); - QString targetKey = QString::fromLocal8Bit(serverBufferIntegrationName); + targetKey = QString::fromLocal8Bit(serverBufferIntegrationName); } else { targetKey = mDisplay->hardwareIntegration()->serverBufferIntegration(); } |