Skip to contentSkip to conversation

qt4: fix path to demos documentation

PATCH In review Jonathan Liu 2 participants 2 messages May 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4: fix path to demos documentation

The qt4-demos-doc package is not created when building qt4-x11-free because ${docdir}/qtopia/qch/qt.qch doesn't exist.

---
 meta/recipes-qt/qt4/qt4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-qt/qt4/qt4.inc +1 -1
index 84c0ae9..828e30a 100644
@@ -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}"
Signature · 1 line
1.8.2.3
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · 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.

---
 meta/recipes-qt/qt4/qt4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-qt/qt4/qt4.inc +0 -0
index 84c0ae9..828e30a 100644

meta/recipes-qt/qt4/qt4.inc ALLOW_EMPTY_${PN} = "1" · line 136

Quoted 8 lines
meta/recipes-qt/qt4/qt4.inc +1 -1
@@ -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}"
Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre