aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-03-16 01:54:39 +1100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-03-15 18:54:38 +0100
commit5b5616b63bdf163ea3eb2ca8857c56a393435fe3 (patch)
tree94739a2a714068908733daca769f7d331837ef22
parent25ad128e1fc3e558dd1608ff254f362d2644a538 (diff)
licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4upstream/dora
The license agreement doesn't mention Nokia anymore after Qt was acquired by Digia. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--licenses/DIGIA-TPLA-2.4 (renamed from licenses/NOKIA-TPLA-2.4)0
-rw-r--r--recipes-qt/qt5/qt3d.inc2
2 files changed, 1 insertions, 1 deletions
diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/DIGIA-TPLA-2.4
index c71a330e..c71a330e 100644
--- a/licenses/NOKIA-TPLA-2.4
+++ b/licenses/DIGIA-TPLA-2.4
diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc
index 78b9ecc5..74c4cada 100644
--- a/recipes-qt/qt5/qt3d.inc
+++ b/recipes-qt/qt5/qt3d.inc
@@ -2,7 +2,7 @@ require qt5.inc
DEPENDS += "qtdeclarative"
-LICENSE = "GFDL-1.3 & LGPL-2.1 & NOKIA-TPLA-2.4 | GPL-3.0"
+LICENSE = "GFDL-1.3 & LGPL-2.1 & DIGIA-TPLA-2.4 | GPL-3.0"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \