qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb

(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-26 20:00:58 +02:00 · 2012-09-26 20:00:58 +02:00 · a0a29221c8
parent 248e9f48c7
commit a0a29221c8
19 changed files with 5 additions and 5 deletions
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 | GPLv3"

 INC_PR = "r11"

-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"

 inherit nativesdk qmake2

--- a/meta/recipes-qt/qt4/qt4-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.1.inc
@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                    file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"

-FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"

 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
           file://0004-no-qmake.patch \
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
--- a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
@ -1,4 +1,4 @@
-require qt-${PV}.inc
+require qt4-${PV}.inc
 require qt4-embedded.inc

 PR = "${INC_PR}.1"
--- a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
@ -3,7 +3,7 @@ require qt4-native.inc
 PR = "${INC_PR}.1"

 # Find the g++.conf/linux.conf in the right directory.
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"

 TOBUILD := "src/tools/bootstrap ${TOBUILD}"

--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-require qt-${PV}.inc
+require qt4-${PV}.inc

 PR = "${INC_PR}.1"