summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-08-27 14:21:16 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-08-27 15:50:04 +0000
commitfc502045452c308dc1c8e3a860a0d3cf9cccef07 (patch)
tree1e9713c2d5f66bfec0fc666e22bae900cef261cd /src
parent0ce9fba0775ce82a0deecc68f3b9febdc57983e5 (diff)
Fix third-party license information about imgui
The qdoc module is called qt3d - calling it "qtrhi" that the attribution never showed up in the documentation. While at it, also document the 'sub-projects' that imgui contains. [ChangeLog][Third-Party Code] Fix issue in the documentation that caused attributions for imgui third-party code to not show up. Change-Id: I5de0ad5f31699f9e8c2a5d492e995d3c9beced97 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit f4de483461ebf23e8ba6a42b391e45af7b7f1781) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/imgui/LICENSE_imstb.txt39
-rw-r--r--src/3rdparty/imgui/LICENSE_proggyclean.txt7
-rw-r--r--src/3rdparty/imgui/qt_attribution.json29
3 files changed, 74 insertions, 1 deletions
diff --git a/src/3rdparty/imgui/LICENSE_imstb.txt b/src/3rdparty/imgui/LICENSE_imstb.txt
new file mode 100644
index 000000000..7161fd113
--- /dev/null
+++ b/src/3rdparty/imgui/LICENSE_imstb.txt
@@ -0,0 +1,39 @@
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
diff --git a/src/3rdparty/imgui/LICENSE_proggyclean.txt b/src/3rdparty/imgui/LICENSE_proggyclean.txt
new file mode 100644
index 000000000..ad4a6b66c
--- /dev/null
+++ b/src/3rdparty/imgui/LICENSE_proggyclean.txt
@@ -0,0 +1,7 @@
+Copyright (c) 2004, 2005 Tristan Grimmer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/3rdparty/imgui/qt_attribution.json b/src/3rdparty/imgui/qt_attribution.json
index 80d8adbcf..c5599b70e 100644
--- a/src/3rdparty/imgui/qt_attribution.json
+++ b/src/3rdparty/imgui/qt_attribution.json
@@ -2,7 +2,7 @@
{
"Id": "imgui",
"Name": "Dear ImGui",
- "QDocModule": "qtrhi",
+ "QDocModule": "qt3d",
"Description": "Dear ImGui",
"QtUsage": "Used in tests to demonstrate and verify the integration of an external GUI library.",
@@ -12,5 +12,32 @@
"LicenseId": "MIT",
"LicenseFile": "LICENSE.txt",
"Copyright": "Copyright (c) 2014-2018 Omar Cornut"
+ },
+ {
+ "Id": "imgui-proggyclean",
+ "Name": "Dear ImGui - ProggyClean.ttf",
+ "QDocModule": "qt3d",
+ "Description": "ProggyClean.ttf font that is embedded into Dear ImGui",
+ "QtUsage": "Used in tests to demonstrate and verify the integration of an external GUI library.",
+ "Files": "imgui_draw.cpp",
+
+ "Homepage": "http://upperbounds.net",
+ "License": "MIT License",
+ "LicenseId": "MIT",
+ "LicenseFile": "LICENSE_proggyclean.txt",
+ "Copyright": "Copyright (c) 2004, 2005 Tristan Grimmer"
+ },
+ {
+ "Id": "imgui-proggyclean",
+ "Name": "Dear ImGui - stb",
+ "QDocModule": "qt3d",
+ "Description": "Single-file public domain (or MIT licensed) libraries for C/C++",
+ "QtUsage": "Used in tests to demonstrate and verify the integration of an external GUI library.",
+ "Files": "imstb_rectpack.h,imstb_textedit.h,imstb_truetype.h",
+
+ "Homepage": "https://github.com/nothings/stb/",
+ "License": "MIT License or Public Domain",
+ "LicenseFile": "LICENSE_imstb.txt",
+ "Copyright": "Copyright (c) 2017 Sean Barrett"
}
]