[oe] [[PATCH][meta-qt5]] maliit-framework-qt5: fixed paths and enabled qt5-inputcontext
Johannes Pointner
h4nn35.work at gmail.com
Wed Sep 30 19:57:13 UTC 2015
*Fixes paths for qt5 and enables qt5-inputcontext.
Signed-off-by: Johannes Pointner <johannes.pointner at gmail.com>
---
recipes-qt/maliit/maliit-framework-qt5_git.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index 975892d..03bd6ed 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -20,9 +20,6 @@ GTKIMMODULES_PACKAGES = "${PN}-gtk"
DEPENDS = "qtdeclarative"
-# FIXME: Do we need something like this with qt5?
-#RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4"
-
RRECOMMENDS_${PN} = "maliit-plugins-qt5"
FILES_${PN} += "\
@@ -30,10 +27,12 @@ FILES_${PN} += "\
${bindir} \
${datadir}/applications/maliit-server.desktop \
${datadir}/dbus-1 \
+ ${libdir}/qt5/plugins/platforminputcontexts \
"
FILES_${PN}-dbg += "\
${libdir}/maliit-framework-tests \
+ ${libdir}/qt5/plugins/platforminputcontexts/.debug \
"
FILES_${PN}-dev += "\
@@ -46,7 +45,7 @@ EXTRA_QMAKEVARS_PRE = "\
PREFIX=${prefix} \
LIBDIR=${libdir} \
DATADIR=${datadir} \
- QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \
+ QT_INSTALL_PLUGINS=${libdir}/qt5/plugins \
MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \
SCHEMADIR=${sysconfdir}/gconf/schemas \
CONFIG+=disable-gconf \
@@ -56,14 +55,15 @@ EXTRA_QMAKEVARS_PRE = "\
CONFIG+=nodoc \
CONFIG+=noxcb \
CONFIG+=enable-dbus-activation \
+ CONFIG+=qt5-inputcontext \
"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
do_install_append() {
#Fix absolute paths
- sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf
- sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf
+ sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf
+ sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf
install -d ${D}${datadir}/applications
install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
--
2.6.0
More information about the Openembedded-devel
mailing list