qt5: change Qt include path

When Qt include path is set to /usr/include, host_build will
incorrectly include other system headers from the sysroot.
To correct this, move Qt include path to /usr/include/qt5, by
overriding qmake5_paths.bbclass in our layer. The bblayer order
needs to be changed for the correct bbclass to be used.

Change-Id: Ie01371662ea0f4718275708a88fb5d301c62fdf7
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 8ea7ff3..db9ac22 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -37,7 +37,6 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-raspberrypi \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-qt5 \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
@@ -45,6 +44,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ${BSPDIR}/sources/poky/meta \