diff options
| author | Chase Maupin <chasemaupin03@gmail.com> | 2010-06-03 05:15:13 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2010-06-03 12:42:19 -0400 |
| commit | db786adf5c23822da8004cdef29c07d3884c8d1f (patch) | |
| tree | 8ec16fe1e5131d819073aaa62955790a2e70f00e | |
| parent | 1a50448dd3a28a07e3049a4ae9f886be75148da0 (diff) | |
qt4-embedded: rename qtdemo file
* 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>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
| -rw-r--r-- | recipes/qt4/qt-4.6.2.inc | 3 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | 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 e89cf1787a..4a9f077aea 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 9aaca6eac2..436f64c973 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 5634911555..4266c2fca4 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -115,8 +115,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/*" |