diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-11-03 14:54:04 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-03 15:38:07 +0000 |
| commit | 5bb679590ea72372b80d83267935f45c8864a15e (patch) | |
| tree | 08dcbbdae0694538abe7c7c8968054c934d69f36 /src/plugins/platforms/eglfs | |
| parent | b825c702ac6111b1bedc8fcebee53b6aab289a67 (diff) | |
Rename "wl_display" native resource
There is already a "wl_display" resource used by the client-side
Wayland plugin. This is confusing, and would cause horrible bugs
if ever a Wayland server was run as a client (the nested compositor
usecase). Therefore, use "server_wl_display" for the name of the
resource to be used on the server side.
Change-Id: I30455177a154e89b98ad3620b6a14626b821e54c
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/plugins/platforms/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index ac6bb34ff1..2086ce56e2 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -264,7 +264,7 @@ static int resourceType(const QByteArray &key) QByteArrayLiteral("eglconfig"), QByteArrayLiteral("nativedisplay"), QByteArrayLiteral("display"), - QByteArrayLiteral("wl_display") + QByteArrayLiteral("server_wl_display") }; const QByteArray *end = names + sizeof(names) / sizeof(names[0]); const QByteArray *result = std::find(names, end, key); |