Patchwork qt4: fix path to demos documentation

login
register
mail settings
Submitter Jonathan Liu
Date May 28, 2013, 8:29 a.m.
Message ID <1369729792-19019-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/50609/
State Accepted
Commit f1b8e24c3607cc8dce839c6f509f550c8e5d44d3
Headers show

Comments

Jonathan Liu - May 28, 2013, 8:29 a.m.
The qt4-demos-doc package is not created when building qt4-x11-free
because ${docdir}/qtopia/qch/qt.qch doesn't exist.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta/recipes-qt/qt4/qt4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paul Eggleton - May 28, 2013, 10:02 a.m.
On Tuesday 28 May 2013 18:29:52 Jonathan Liu wrote:
> The qt4-demos-doc package is not created when building qt4-x11-free
> because ${docdir}/qtopia/qch/qt.qch doesn't exist.
> 
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>  meta/recipes-qt/qt4/qt4.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 84c0ae9..828e30a 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -130,7 +130,7 @@ ALLOW_EMPTY_${PN} = "1"
>  FILES_${PN}     = ""
>  FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
>  FILES_${PN}-dbg = "/usr/src/debug/"
> -FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
> +FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
>  RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
>  RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
>  RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Patch

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 84c0ae9..828e30a 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -130,7 +130,7 @@  ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
 FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
 FILES_${PN}-dbg = "/usr/src/debug/"
-FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
+FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
 RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
 RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
 RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"