diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-01-21 09:25:32 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-01-21 09:25:32 +0100 |
| commit | 5f645af22bb63f0d215294535cf683029ed7aab5 (patch) | |
| tree | 04010e754bbcb70577cee5f396083d0333fe7b4c /src/3rdparty/protocol/qt_attribution.json | |
| parent | 9fbaa5c13cfb9712273586abbb708eff07df60a5 (diff) | |
| parent | d296dea131ad51cfb4809e9a5e2d6908b2844a57 (diff) | |
Merge remote-tracking branch 'qt/5.12.1' into 5.12
Change-Id: I6ca92b605c55b0c8941d42e40fad624f00a65cd3
Diffstat (limited to 'src/3rdparty/protocol/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/protocol/qt_attribution.json | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/3rdparty/protocol/qt_attribution.json b/src/3rdparty/protocol/qt_attribution.json index e5bf91e10..7881e6b0d 100644 --- a/src/3rdparty/protocol/qt_attribution.json +++ b/src/3rdparty/protocol/qt_attribution.json @@ -103,5 +103,20 @@ Copyright © 2010-2013 Intel Corporation" "LicenseFile": "HPND_LICENSE.txt", "Copyright": "Copyright © 2012, 2013 Intel Corporation Copyright © 2015, 2016 Jan Arne Petersen" - } + }, + + { + "Id": "wayland-eglstream-controller", + "Name": "Wayland EGLStream Controller Protocol", + "QDocModule": "qtwaylandcompositor", + "QtUsage": "Used in the Qt Wayland Compositor", + "Files": "wayland-eglstream-controller.xml", + + "Description": "Allows clients to request that the compositor creates its EGLStream.", + "Homepage": "https://github.com/NVIDIA/egl-wayland", + "LicenseId": "MIT", + "License": "MIT License", + "LicenseFile": "MIT_LICENSE.txt", + "Copyright": "Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved." + } ] |