summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-05 10:42:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-06 11:09:24 -0700
commite8a3686ec108f6095bafa5b601c9f763bc39c123 (patch)
tree13b94edec96804db01c8835c267e5d71da1d846b /meta/recipes-qt/qt4
parentceffea9c2ffe4422fd98524d3265f8d00bc80f9a (diff)
downloadopenembedded-core-e8a3686ec108f6095bafa5b601c9f763bc39c123.tar.gz
openembedded-core-e8a3686ec108f6095bafa5b601c9f763bc39c123.tar.bz2
openembedded-core-e8a3686ec108f6095bafa5b601c9f763bc39c123.tar.xz
openembedded-core-e8a3686ec108f6095bafa5b601c9f763bc39c123.zip
qt4: replace 4.7.1 with version 4.7.2
Qt 4.7.2 is a bugfix release for the 4.7 series - more details here: http://qt.nokia.com/developer/changes/changes-4.7.2/ This was prompted by the equivalent change in OE, however the change was redone by hand. There are no changes to the recipes themselves other than updating SRC_URI checksums and resetting PR. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2.inc (renamed from meta/recipes-qt/qt4/qt-4.7.1.inc)4
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/g++.conf (renamed from meta/recipes-qt/qt4/qt-4.7.1/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch (renamed from meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/linux.conf (renamed from meta/recipes-qt/qt4/qt-4.7.1/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb)2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb)4
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb)2
10 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.1.inc b/meta/recipes-qt/qt4/qt-4.7.2.inc
index 70ee59697..ed62bd3c0 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.2.inc
@@ -14,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://linux.conf \
"
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
index 71a04a59d..71a04a59d 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/g++.conf b/meta/recipes-qt/qt4/qt-4.7.2/g++.conf
index 80f925cc5..80f925cc5 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/g++.conf
+++ b/meta/recipes-qt/qt4/qt-4.7.2/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
index 5c588ff0f..5c588ff0f 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/linux.conf b/meta/recipes-qt/qt4/qt-4.7.2/linux.conf
index a54135513..a54135513 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt-4.7.2/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
index c3f671319..b88b1e949 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
index e9de510fe..d3c0edae6 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
deleted file mode 100644
index 091a53927..000000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
new file mode 100644
index 000000000..a917ac4b5
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
@@ -0,0 +1,6 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
index 75c6314e7..359a7561d 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "