summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-11-17 15:48:17 +0100
committerKai Koehne <kai.koehne@qt.io>2016-11-23 09:35:41 +0000
commitb6f4003b87c92061cc5ef22f40f844ae16bf09bb (patch)
tree9825c5cfef8e00a2be386ec3025d1c499985e682 /src/3rdparty
parentae93a76c931d7de768d5ac600a092bdc87915d3e (diff)
Fix forkfd 3rd party documenation
Bring the copyright lines in the license and the one's in the metadata into line by using the ones from forkfd.c. Also bring back description of forkfd from 5.6 documentation. Change-Id: I423ee8d5d1e1c866a34c346f78520d33ea099b5e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/forkfd/LICENSE1
-rw-r--r--src/3rdparty/forkfd/qt_attribution.json2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/forkfd/LICENSE b/src/3rdparty/forkfd/LICENSE
index 351ebf705d..36ab612951 100644
--- a/src/3rdparty/forkfd/LICENSE
+++ b/src/3rdparty/forkfd/LICENSE
@@ -1,4 +1,5 @@
Copyright (C) 2016 Intel Corporation.
+Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/src/3rdparty/forkfd/qt_attribution.json b/src/3rdparty/forkfd/qt_attribution.json
index 89f25f4870..f004116753 100644
--- a/src/3rdparty/forkfd/qt_attribution.json
+++ b/src/3rdparty/forkfd/qt_attribution.json
@@ -7,6 +7,6 @@
"License": "MIT License",
"LicenseId": "MIT",
"LicenseFile": "LICENSE",
- "Copyright": "Copyright (C) 2013-2016 Intel Corporation
+ "Copyright": "Copyright (C) 2016 Intel Corporation
Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com"
}