qt4: Qt4.5 is released under LGPLv2.1 and GPLv3

Update licensing bits on the Qt classes.

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 31bfe0fee20ae6d7fd8fbf94500270e93d73161b..5aa07c2ebb198c529108eab8b14ecd84d0d0bea5 100644 (file)
--- 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 dff754c68ca72d7bd14001ff53952cbc4c3fd9a2..bbe119c89f58cf4dee11b5c693f82acc69a50feb 100644 (file)
--- 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 d1962bf98faa6b7b68abab4c7b89a803fb93373c..8eed0034dbf639e9c54fab18a230929c0e27ea82 100644 (file)
--- 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 db919fd6dff2206f8a658c49abc405820a36181f..fafb7710c95c5d9d3336ed70dea1984cdf7f07f7 100644 (file)
--- 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 2e2364414dd3ad3060b19e492e543f252e4b0c8e..bb5f355e6aef1deb7ed7875d087cdc23e9c39769 100644 (file)
--- 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 14d635c04f311d3f087771b09c6eb77a8392f215..27e45ed1677d609912ac88e6d45cfdabc35457cb 100644 (file)
--- 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"