[oe] [PATCH] qt4-embedded: rename qtdemo file

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03-06-10 17:15, Chase Maupin wrote:
> * Changed the name of the qtdemo exectable installed
>   in the /usr/bin directory to qtdemoE for Qt
>   embedded builds.  This allows the Qt embedded
>   version of the demos package to co-exist with
>   the Qt X11 version.
> * Changed the demos package file list to accept
>   both qtdemo and qtdemoE.
> 
> Signed-off-by: Chase Maupin <chase.maupin at ti.com>

Acked-by: Koen Kooi <k-kooi at ti.com>



> ---
>  recipes/qt4/qt-4.6.2.inc     |    3 +++
>  recipes/qt4/qt4-embedded.inc |    2 +-
>  recipes/qt4/qt4.inc          |    4 ++--
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc
> index e89cf17..4a9f077 100644
> --- a/recipes/qt4/qt-4.6.2.inc
> +++ b/recipes/qt4/qt-4.6.2.inc
> @@ -57,6 +57,9 @@ 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
> +	mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
>  }
>  
>  LICENSE = "LGPLv2.1 GPLv3"
> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> index 9aaca6e..436f64c 100644
> --- a/recipes/qt4/qt4-embedded.inc
> +++ b/recipes/qt4/qt4-embedded.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
>  PRIORITY = "optional"
>  HOMEPAGE = "http://www.trolltech.com"
>  DEPENDS += "directfb tslib"
> -INC_PR = "r19"
> +INC_PR = "r20"
>  
>  QT_BASE_NAME ?= "qt4-embedded"
>  QT_BASE_LIB  ?= "libqt-embedded"
> diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
> index 5a19f65..e246e17 100644
> --- a/recipes/qt4/qt4.inc
> +++ b/recipes/qt4/qt4.inc
> @@ -103,8 +103,8 @@ FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
>  FILES_${QT_BASE_NAME}-common-dbg           = "${bindir}/.debug/qtconfig"
>  FILES_${QT_BASE_NAME}-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
>  FILES_${QT_BASE_NAME}-dbus-dbg             = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
> -FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
> -FILES_${QT_BASE_NAME}-demos-dbg            = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/*  ${bindir}/${QT_DIR_NAME}/demos/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> +FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
> +FILES_${QT_BASE_NAME}-demos-dbg            = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/*  ${bindir}/${QT_DIR_NAME}/demos/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
>  FILES_${QT_BASE_NAME}-designer             = "${bindir}/*designer*"
>  FILES_${QT_BASE_NAME}-designer-dbg         = "${bindir}/.debug/*designer*"
>  FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_DIR_NAME}/examples/*"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMB88uMkyGM64RGpERAvNNAJ9dxgbS0or8dffW2g3EyQDgy2+YLACeKsUl
aw4UUGIRN8dpTA3Y694MOFY=
=YC+E
-----END PGP SIGNATURE-----