From 7cdcc9ad25c0affb3982c4f0e4d0fb21137ba26c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Fri, 31 Jul 2009 18:32:05 +0200
Subject: qt4: Qt4.5 is released under LGPLv2.1 and GPLv3

Update licensing bits on the Qt classes.
---
 recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled | 2 ++
 recipes/qt4/qt4-embedded_4.5.2.bb               | 2 +-
 recipes/qt4/qt4-tools-native_4.5.2.bb           | 1 +
 recipes/qt4/qt4-tools-sdk_4.5.2.bb              | 2 +-
 recipes/qt4/qt4-x11-free-gles_git.bb.disabled   | 2 +-
 recipes/qt4/qt4-x11-free_4.5.2.bb               | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'recipes/qt4')

diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
index 31bfe0fee2..5aa07c2ebb 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
@@ -6,6 +6,8 @@ QT_CONFIG_FLAGS += "-D QT_QWS_CLIENTBLIT -depths 16,24,32 -opengl es1 -plugin-gf
 
 require qt4-embedded_${PV}.bb
 
+LICENSE = "LGPLv2.1 GPLv3"
+
 DEPENDS += "virtual/egl"
 SRC_URI += "file://sgx-hack.patch;patch=1"
 
diff --git a/recipes/qt4/qt4-embedded_4.5.2.bb b/recipes/qt4/qt4-embedded_4.5.2.bb
index dff754c68c..bbe119c89f 100644
--- a/recipes/qt4/qt4-embedded_4.5.2.bb
+++ b/recipes/qt4/qt4-embedded_4.5.2.bb
@@ -2,5 +2,5 @@ include qt4-embedded.inc
 
 PR = "${INC_PR}.1"
 
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1"
diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
index d1962bf98f..8eed0034db 100644
--- a/recipes/qt4/qt4-tools-native_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.2.bb
@@ -1,4 +1,5 @@
 require qt4-tools-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.1"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
index db919fd6df..fafb7710c9 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
@@ -3,7 +3,7 @@ DEPENDS = "zlib-native dbus-native"
 SECTION = "libs"
 HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "LGPLv2.1 GPLv3"
 
 inherit sdk
 
diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
index 2e2364414d..bb5f355e6a 100644
--- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
@@ -5,7 +5,7 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:"
 QT_GLFLAGS = "-opengl es1 -openvg" 
 
 include qt4-x11-free.inc
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.0+gitr${SRCREV}"
 
 DEPENDS += "virtual/egl"
diff --git a/recipes/qt4/qt4-x11-free_4.5.2.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb
index 14d635c04f..27e45ed167 100644
--- a/recipes/qt4/qt4-x11-free_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.2.bb
@@ -1,4 +1,4 @@
 include qt4-x11-free.inc
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.2"
 
-- 
cgit 1.2.3-korg