Commit f87bc6bd authored by Florent Revest's avatar Florent Revest

Set QT_DIR_NAME to an empty string so that Qt specific binaries are no longer...

Set QT_DIR_NAME to an empty string so that Qt specific binaries are no longer installed in odd not-in-PATH places like /usr/bin/qt5/. It also removes the need for some ugly sed hacks. Cf: https://github.com/meta-qt5/meta-qt5/blob/master/classes/qmake5_paths.bbclass
parent ceef1ff2
......@@ -29,3 +29,4 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_initscripts = ""
PREFERRED_PROVIDER_udev = "systemd"
QT_DIR_NAME = ""
......@@ -18,12 +18,6 @@ RDEPENDS_${PN} += "qt5-qpa-hwcomposer-plugin"
inherit qmake5
do_configure_prepend() {
sed -i "s@system(qdbusxml2cpp@system(${STAGING_BINDIR_NATIVE}/qt5/qdbusxml2cpp@" ${S}/src/compositor/compositor.pri ${S}/tools/notificationtool/notificationtool.pro ${S}/src/src.pro
sed -i "s@ lupdate@ ${STAGING_BINDIR_NATIVE}/qt5/lupdate@" ${S}/src/compositor/compositor.pri ${S}/tools/notificationtool/notificationtool.pro ${S}/src/src.pro
sed -i "s@ lrelease@ ${STAGING_BINDIR_NATIVE}/qt5/lrelease@" ${S}/src/compositor/compositor.pri ${S}/src/src.pro
}
FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qt5/qml/org/nemomobile/lipstick/qmldir"
FILES_${PN}-dev += "/usr/lib/liblipstick-qt5.prl"
FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/nemomobile/lipstick/.debug"
......
......@@ -16,7 +16,6 @@ B = "${WORKDIR}/git"
do_configure_prepend() {
sed -i "/tests/d" ${S}/mlite.pro
sed -i "s@system(qdbusxml2cpp@system(${STAGING_BINDIR_NATIVE}/qt5/qdbusxml2cpp@" ${S}/src/src.pro
}
do_install_append() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment