diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-21 23:59:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-22 01:53:29 +0100 |
| commit | bf58c70546c5f9cb66d99b82abfde9ba1a056192 (patch) | |
| tree | df3675d3377ef6576f82fb167ebd67fcc900a91b /src/3rdparty/angle/TRACEEVENT_LICENSE | |
| parent | 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 (diff) | |
| parent | 41cba737a98b16a2767c55cda0532f38b6b6a37d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/io/qdir.cpp
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtimer.h
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
Diffstat (limited to 'src/3rdparty/angle/TRACEEVENT_LICENSE')
| -rw-r--r-- | src/3rdparty/angle/TRACEEVENT_LICENSE | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/3rdparty/angle/TRACEEVENT_LICENSE b/src/3rdparty/angle/TRACEEVENT_LICENSE new file mode 100644 index 0000000000..34d6cd9268 --- /dev/null +++ b/src/3rdparty/angle/TRACEEVENT_LICENSE @@ -0,0 +1,27 @@ +Copyright 2013 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |