aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-03-25 12:32:25 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2009-03-25 12:32:25 +0100
commit88c677023e77186ea9198d9ece6943712d069ecc (patch)
tree71eea88fcc56431649b03d3c4b6e29d178f0f56d
parent2fa972014da492233781741da3cb8880d6b8fa42 (diff)
downloadopenembedded-88c677023e77186ea9198d9ece6943712d069ecc.tar.gz
openembedded-88c677023e77186ea9198d9ece6943712d069ecc.tar.bz2
openembedded-88c677023e77186ea9198d9ece6943712d069ecc.zip
qt-embedded: rename to qt4-embedded for consistency
-rw-r--r--classes/qt4e.bbclass2
-rw-r--r--recipes/qt4/qt-embedded_4.4.3.bb2
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0001-cross-compile.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0001-cross-compile.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0003-no-tools.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0004-no-qmake.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0004-no-qmake.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0005-fix-mkspecs.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0005-fix-mkspecs.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0006-freetype-host-includes.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch (renamed from recipes/qt4/qt-embedded-4.4.3/0007-openssl-host-includes.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/build-tools.patch (renamed from recipes/qt4/qt-embedded-4.4.3/build-tools.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/linux-oe-qmake.conf (renamed from recipes/qt4/qt-embedded-4.4.3/linux-oe-qmake.conf)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/qconfig-oe.h (renamed from recipes/qt4/qt-embedded-4.4.3/qconfig-oe.h)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/qt-lib-infix.patch (renamed from recipes/qt4/qt-embedded-4.4.3/qt-lib-infix.patch)0
-rw-r--r--recipes/qt4/qt4-embedded-4.4.3/support-2bpp.patch (renamed from recipes/qt4/qt-embedded-4.4.3/support-2bpp.patch)0
-rw-r--r--recipes/qt4/qt4-embedded.inc (renamed from recipes/qt4/qt-embedded.inc)0
-rw-r--r--recipes/qt4/qt4-embedded_4.4.3.bb2
15 files changed, 3 insertions, 3 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index e3d6fad7a0..445ecbaa6a 100644
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
inherit qmake2
QT_DIR_NAME = "qtopia"
diff --git a/recipes/qt4/qt-embedded_4.4.3.bb b/recipes/qt4/qt-embedded_4.4.3.bb
deleted file mode 100644
index d0f57ca35f..0000000000
--- a/recipes/qt4/qt-embedded_4.4.3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require qt-embedded.inc
-PR = "r7"
diff --git a/recipes/qt4/qt-embedded-4.4.3/0001-cross-compile.patch b/recipes/qt4/qt4-embedded-4.4.3/0001-cross-compile.patch
index f20576b45e..f20576b45e 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0001-cross-compile.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0001-cross-compile.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch
index bb36444f80..bb36444f80 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0003-no-tools.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/0004-no-qmake.patch b/recipes/qt4/qt4-embedded-4.4.3/0004-no-qmake.patch
index 28f8d3ad9d..28f8d3ad9d 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0004-no-qmake.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0004-no-qmake.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/0005-fix-mkspecs.patch b/recipes/qt4/qt4-embedded-4.4.3/0005-fix-mkspecs.patch
index c6f55906bc..c6f55906bc 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0005-fix-mkspecs.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0005-fix-mkspecs.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch
index cc8e115fee..cc8e115fee 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0006-freetype-host-includes.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch
index 35b71d9694..35b71d9694 100644
--- a/recipes/qt4/qt-embedded-4.4.3/0007-openssl-host-includes.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/build-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/build-tools.patch
index 54ad666374..54ad666374 100644
--- a/recipes/qt4/qt-embedded-4.4.3/build-tools.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/build-tools.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/linux-oe-qmake.conf b/recipes/qt4/qt4-embedded-4.4.3/linux-oe-qmake.conf
index fc5ac6dc5c..fc5ac6dc5c 100644
--- a/recipes/qt4/qt-embedded-4.4.3/linux-oe-qmake.conf
+++ b/recipes/qt4/qt4-embedded-4.4.3/linux-oe-qmake.conf
diff --git a/recipes/qt4/qt-embedded-4.4.3/qconfig-oe.h b/recipes/qt4/qt4-embedded-4.4.3/qconfig-oe.h
index f820c01da8..f820c01da8 100644
--- a/recipes/qt4/qt-embedded-4.4.3/qconfig-oe.h
+++ b/recipes/qt4/qt4-embedded-4.4.3/qconfig-oe.h
diff --git a/recipes/qt4/qt-embedded-4.4.3/qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.4.3/qt-lib-infix.patch
index b1a443f24c..b1a443f24c 100644
--- a/recipes/qt4/qt-embedded-4.4.3/qt-lib-infix.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/qt-lib-infix.patch
diff --git a/recipes/qt4/qt-embedded-4.4.3/support-2bpp.patch b/recipes/qt4/qt4-embedded-4.4.3/support-2bpp.patch
index 82506bcbec..82506bcbec 100644
--- a/recipes/qt4/qt-embedded-4.4.3/support-2bpp.patch
+++ b/recipes/qt4/qt4-embedded-4.4.3/support-2bpp.patch
diff --git a/recipes/qt4/qt-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 7de7a80a47..7de7a80a47 100644
--- a/recipes/qt4/qt-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb
new file mode 100644
index 0000000000..a0bae7262b
--- /dev/null
+++ b/recipes/qt4/qt4-embedded_4.4.3.bb
@@ -0,0 +1,2 @@
+require qt4-embedded.inc
+PR = "r8"