summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:00:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:26 +0100
commita0a29221c8df7c277139b0c875330f08cb2bdea3 (patch)
tree967c8777a198f33333e458ca8579fe896c784e99
parent248e9f48c77212372b50074f0a475a16bb8db4be (diff)
downloadpoky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz
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>
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1.inc (renamed from meta/recipes-qt/qt4/qt-4.8.1.inc)2
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/g++.conf (renamed from meta/recipes-qt/qt4/qt-4.8.1/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/linux.conf (renamed from meta/recipes-qt/qt4/qt-4.8.1/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch (renamed from meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb2
19 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 0228b569e8..542f3952f0 100644
--- 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"
6 6
7INC_PR = "r11" 7INC_PR = "r11"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
10 10
11inherit nativesdk qmake2 11inherit nativesdk qmake2
12 12
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt4-4.8.1.inc
index aa18301197..ace665f49e 100644
--- a/meta/recipes-qt/qt4/qt-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 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
5 5
6FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
7 7
8SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 8SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
9 file://0004-no-qmake.patch \ 9 file://0004-no-qmake.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
index f302c5bd61..f302c5bd61 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
index d74f7fde1a..d74f7fde1a 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
index d455d0acfe..d455d0acfe 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
index 6efbaf5d97..6efbaf5d97 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
index 906d4e312f..906d4e312f 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
index 81245059c0..81245059c0 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
index e58fb15718..e58fb15718 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
index 47618cfde1..47618cfde1 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
index 09513b6ae7..09513b6ae7 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
diff --git a/meta/recipes-qt/qt4/qt-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
index 39c5f4a32c..39c5f4a32c 100644
--- a/meta/recipes-qt/qt4/qt-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
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
index a54135513b..a54135513b 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
index 0992efaddc..0992efaddc 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
index d5eac6b167..d5eac6b167 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
index 82bff04974..82bff04974 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
index 668565e189..5a3dc6537a 100644
--- 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 @@
1require qt-${PV}.inc 1require qt4-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.1"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
index a2a1dbda93..c09e6df111 100644
--- 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
3PR = "${INC_PR}.1" 3PR = "${INC_PR}.1"
4 4
5# Find the g++.conf/linux.conf in the right directory. 5# Find the g++.conf/linux.conf in the right directory.
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
7 7
8TOBUILD := "src/tools/bootstrap ${TOBUILD}" 8TOBUILD := "src/tools/bootstrap ${TOBUILD}"
9 9
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
index 6978053692..9b03ff2f57 100644
--- 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 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt4-${PV}.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.1"
5 5