1 files changed, 11 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index b29bc891..79a4833c 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -22,6 +22,17 @@ do_install() {
     qmake5_base_do_install
 }
 
+# we don't want conflicts with qt4
+OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations"
+OE_QMAKE_PATH_DOCS = "${docdir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}"
+OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples"
+OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests"
+
 PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
 
 # extra -dbg packages