From fe1f11a062da26736dc4fe7f6625f1595689d66e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 1 Mar 2015 23:23:44 +0100 Subject: qt-creator: avoid conflicts with meta-qt5's qt5-creator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We avoid conflicts by installing no files to sysroot. This causes no fallout because nothing depends on qt5-creator (if something included later depending on qt-creator it should depend on qt5-creator). Note that | WARNING: QA Issue: qt5-creator rdepends on qt-creator, but it isn't a build dependency? [build-deps] is a false positve because the names of the libraries are same as for qt5-creator (see test below). This patch was tested by: 1. building qt-creator from scratch 2. building an image containing qt5-creator. * qt5-creator did not fail for sysroot conflicts * image was build without pulling qt-creator Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb index 11d7be7d62..670ffad010 100644 --- a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb +++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb @@ -33,6 +33,11 @@ RRECOMMENDS_${PN} += "packagegroup-core-buildessential \ qt4-plugin-sqldriver-sqlite \ " +# avoid conflicts with meta-qt5's qt-creator and do install nothing to sysroot +# this does no harm cause nothing depends on qt-creator +sysroot_stage_all() { +} + # the regexp in insane.bbclass doesn't allow this valid path: # qt-creator-2.8.1: qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_cpp_scanner.so # qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_qt_scanner.so -- cgit 1.2.3-korg