From 88c677023e77186ea9198d9ece6943712d069ecc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 25 Mar 2009 12:32:25 +0100 Subject: [PATCH] qt-embedded: rename to qt4-embedded for consistency --- classes/qt4e.bbclass | 2 +- recipes/qt4/qt-embedded_4.4.3.bb | 2 -- .../0001-cross-compile.patch | 0 .../0003-no-tools.patch | 0 .../0004-no-qmake.patch | 0 .../0005-fix-mkspecs.patch | 0 .../0006-freetype-host-includes.patch | 0 .../0007-openssl-host-includes.patch | 0 .../{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/build-tools.patch | 0 .../linux-oe-qmake.conf | 0 .../qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/qconfig-oe.h | 0 .../qt-lib-infix.patch | 0 .../support-2bpp.patch | 0 recipes/qt4/{qt-embedded.inc => qt4-embedded.inc} | 0 recipes/qt4/qt4-embedded_4.4.3.bb | 2 ++ 15 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 recipes/qt4/qt-embedded_4.4.3.bb rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0001-cross-compile.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0003-no-tools.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0004-no-qmake.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0005-fix-mkspecs.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0006-freetype-host-includes.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/0007-openssl-host-includes.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/build-tools.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/linux-oe-qmake.conf (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/qconfig-oe.h (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/qt-lib-infix.patch (100%) rename recipes/qt4/{qt-embedded-4.4.3 => qt4-embedded-4.4.3}/support-2bpp.patch (100%) rename recipes/qt4/{qt-embedded.inc => qt4-embedded.inc} (100%) create mode 100644 recipes/qt4/qt4-embedded_4.4.3.bb 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0001-cross-compile.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0003-no-tools.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0004-no-qmake.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0005-fix-mkspecs.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0006-freetype-host-includes.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/0007-openssl-host-includes.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/build-tools.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/linux-oe-qmake.conf rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/qconfig-oe.h rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/qt-lib-infix.patch rename to 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 similarity index 100% rename from recipes/qt4/qt-embedded-4.4.3/support-2bpp.patch rename to recipes/qt4/qt4-embedded-4.4.3/support-2bpp.patch diff --git a/recipes/qt4/qt-embedded.inc b/recipes/qt4/qt4-embedded.inc similarity index 100% rename from recipes/qt4/qt-embedded.inc rename to 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" -- 2.39.5