aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-07-27 12:32:06 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-07-27 12:36:51 +0100
commit4123fb4d8fdde0a8e67c0d1042119158d0d2df57 (patch)
treee5bea79d1d460db1650057a614c04adc2e64f733
parent1c68d97a1272401b52a77cfb8cc572c7175ff8a5 (diff)
downloadmeta-opie-4123fb4d8fdde0a8e67c0d1042119158d0d2df57.zip
meta-opie-4123fb4d8fdde0a8e67c0d1042119158d0d2df57.tar.gz
meta-opie-4123fb4d8fdde0a8e67c0d1042119158d0d2df57.tar.bz2
Remove references to QPL in LICENSE
QPL is an available choice for the license within the QtE 2.3.10 source, but would never be a practical selection for us because it is not GPL-compatible, so there's no point in mentioning it. Removing it fixes a warning as well (since we have no generic QPL license file). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-qt/qmake/qmake_1.07a.bb2
-rw-r--r--recipes-qt/uicmoc/uicmoc_2.3.10.bb2
-rw-r--r--recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb2
-rw-r--r--recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb2
-rw-r--r--recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb2
-rw-r--r--recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb2
-rw-r--r--recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb2
7 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qmake/qmake_1.07a.bb b/recipes-qt/qmake/qmake_1.07a.bb
index 7b8bc77..1ee0a0f 100644
--- a/recipes-qt/qmake/qmake_1.07a.bb
+++ b/recipes-qt/qmake/qmake_1.07a.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "TrollTech Makefile Generator"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
PR = "r7"
QTEVER = "qt-embedded-free-3.3.5"
diff --git a/recipes-qt/uicmoc/uicmoc_2.3.10.bb b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
index 0588436..2afd57a 100644
--- a/recipes-qt/uicmoc/uicmoc_2.3.10.bb
+++ b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
PR = "r6"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
diff --git a/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
index d2d8002..2a5dc89 100644
--- a/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Common files for Qt/Embedded fonts"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
PR = "r4"
SRC_URI = "file://update-qtfontdir"
diff --git a/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
index 86b6c56..c850453 100644
--- a/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
@@ -2,7 +2,7 @@ require qpf.inc
DESCRIPTION = "Helvetica fonts - QPF Edition"
HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
PR = "r2"
SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/qpf-helvetica.tar.bz2"
diff --git a/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb b/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
index 89e148f..372849c 100644
--- a/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
@@ -2,7 +2,7 @@ require qpf.inc
DESCRIPTION = "Qt/Embedded fonts version ${PV}"
HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
PR = "r2"
PROVIDES = "qte-font-helvetica-100 qte-font-helvetica-120"
diff --git a/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
index b9409be..f10341b 100644
--- a/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
@@ -1,7 +1,7 @@
require qpf.inc
DESCRIPTION = "Unicode fonts - QPF Edition"
-LICENSE = "GPLv2 | QPL"
+LICENSE = "GPLv2"
RPROVIDES_${PN} = "virtual-japanese-font"
PR = "r3"
diff --git a/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
index f530a18..790628c 100644
--- a/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
@@ -2,7 +2,7 @@ require qpf.inc
DESCRIPTION = "Utopia fonts - QPF Edition"
HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
-LICENSE = "GPL | QPL"
+LICENSE = "GPL"
PR = "r2"
SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2"