aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-10-29 17:48:48 +0200
committerEric Bénard <eric@eukrea.com>2010-10-31 14:44:27 +0100
commit2af9fd78689d2f2282c9edae27962bc57eedc65f (patch)
treef9608fd03a00d3713d4066375b0949fc5b5b6649
parentb457e1c001a51dc2d8fdaaf204b4e0ce6ae4d75c (diff)
downloadopenembedded-2af9fd78689d2f2282c9edae27962bc57eedc65f.zip
openembedded-2af9fd78689d2f2282c9edae27962bc57eedc65f.tar.gz
openembedded-2af9fd78689d2f2282c9edae27962bc57eedc65f.tar.bz2
qt-4.7: rename qtdemo to qtdemoE for qt4-embedded
in order to stay consistant with 4.6.x releases. Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Denys Dmytriyenko <denis@denix.org>
-rw-r--r--recipes/qt4/qt-4.7.0.inc5
-rw-r--r--recipes/qt4/qt4-embedded_4.7.0.bb2
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes/qt4/qt-4.7.0.inc b/recipes/qt4/qt-4.7.0.inc
index cf4b0d8..ba2b25a 100644
--- a/recipes/qt4/qt-4.7.0.inc
+++ b/recipes/qt4/qt-4.7.0.inc
@@ -60,6 +60,11 @@ do_install_append() {
for i in rcc uic moc ; do
install -m 0755 ${S}/bin/$i ${D}${bindir}/
done
+
+ #Append an E to the qtdemo file
+ if [ -n "${QT_LIBINFIX}" ] ; then
+ mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+ fi
}
SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5"
diff --git a/recipes/qt4/qt4-embedded_4.7.0.bb b/recipes/qt4/qt4-embedded_4.7.0.bb
index 1cd43a6..7e3d4b8 100644
--- a/recipes/qt4/qt4-embedded_4.7.0.bb
+++ b/recipes/qt4/qt4-embedded_4.7.0.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
require qt4-embedded.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "