From: Koen Kooi <k.kooi@student.utwente.nl>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH] qt4-embedded: rename qtdemo file
Date: Thu, 03 Jun 2010 17:50:06 +0200 [thread overview]
Message-ID: <hu8ivf$250$1@dough.gmane.org> (raw)
In-Reply-To: <1275578113-17291-1-git-send-email-chase.maupin@ti.com>
-----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@ti.com>
Acked-by: Koen Kooi <k-kooi@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-----
next prev parent reply other threads:[~2010-06-03 15:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 15:15 [PATCH] qt4-embedded: rename qtdemo file Chase Maupin
2010-06-03 15:50 ` Koen Kooi [this message]
2010-06-03 16:50 ` Denys Dmytriyenko
2010-06-09 13:55 ` Marco Cavallini
2010-06-09 14:08 ` Phil Blundell
2010-06-11 16:00 ` Leon Woestenberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='hu8ivf$250$1@dough.gmane.org' \
--to=k.kooi@student.utwente.nl \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox