summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-10 13:41:23 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-18 11:41:28 +0000
commit878f786665113af2bd61a6df2739157dbf15b630 (patch)
treee8184947315f82b650cee80c270969ccf6a0e37d /conf
parent3d6ae5bb0d62ebaded4011ab0a3fd49631ad107d (diff)
downloadmeta-boot2qt-878f786665113af2bd61a6df2739157dbf15b630.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/bblayers.conf.bbb.sample2
-rw-r--r--conf/bblayers.conf.emulator.sample2
-rw-r--r--conf/bblayers.conf.fsl.sample2
-rw-r--r--conf/bblayers.conf.nuc.sample2
-rw-r--r--conf/bblayers.conf.nvidia-logan.sample2
-rw-r--r--conf/bblayers.conf.rpi.sample2
-rw-r--r--conf/bblayers.conf.sample2
-rw-r--r--conf/bblayers.conf.ti.sample2
-rw-r--r--conf/bblayers.conf.tibidabo.sample2
-rw-r--r--conf/bblayers.conf.toradex.sample2
-rw-r--r--conf/distro/b2qt.conf2
11 files changed, 10 insertions, 12 deletions
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 65ed121..617e039 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -37,12 +37,12 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
44 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \ 43 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
45 ${BSPDIR}/sources/meta-mingw \ 44 ${BSPDIR}/sources/meta-mingw \
45 ${BSPDIR}/sources/meta-qt5 \
46 " 46 "
47BBLAYERS_NON_REMOVABLE ?= " \ 47BBLAYERS_NON_REMOVABLE ?= " \
48 ${BSPDIR}/sources/poky/meta \ 48 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 975776e..4703b10 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -34,10 +34,10 @@ BBLAYERS ?= " \
34 ${BSPDIR}/sources/meta-openembedded/meta-python \ 34 ${BSPDIR}/sources/meta-openembedded/meta-python \
35 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 35 ${BSPDIR}/sources/meta-openembedded/meta-networking \
36 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 36 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
37 ${BSPDIR}/sources/meta-qt5 \
38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 37 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
39 ${BSPDIR}/sources/meta-b2qt \ 38 ${BSPDIR}/sources/meta-b2qt \
40 ${BSPDIR}/sources/meta-mingw \ 39 ${BSPDIR}/sources/meta-mingw \
40 ${BSPDIR}/sources/meta-qt5 \
41 " 41 "
42BBLAYERS_NON_REMOVABLE ?= " \ 42BBLAYERS_NON_REMOVABLE ?= " \
43 ${BSPDIR}/sources/poky/meta \ 43 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 50ebdc4..b05310d 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample
index 57ff3cc..fe8fe20 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.nuc.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index b447bcc..0c8fb99 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -35,11 +35,11 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-python \ 35 ${BSPDIR}/sources/meta-openembedded/meta-python \
36 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 36 ${BSPDIR}/sources/meta-openembedded/meta-networking \
37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 39 ${BSPDIR}/sources/meta-b2qt \
41 ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \ 40 ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
42 ${BSPDIR}/sources/meta-mingw \ 41 ${BSPDIR}/sources/meta-mingw \
42 ${BSPDIR}/sources/meta-qt5 \
43 " 43 "
44 44
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index a8d401c..6b12ac5 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -35,10 +35,10 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-python \ 35 ${BSPDIR}/sources/meta-openembedded/meta-python \
36 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 36 ${BSPDIR}/sources/meta-openembedded/meta-networking \
37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 39 ${BSPDIR}/sources/meta-b2qt \
41 ${BSPDIR}/sources/meta-mingw \ 40 ${BSPDIR}/sources/meta-mingw \
41 ${BSPDIR}/sources/meta-qt5 \
42 " 42 "
43BBLAYERS_NON_REMOVABLE ?= " \ 43BBLAYERS_NON_REMOVABLE ?= " \
44 ${BSPDIR}/sources/poky/meta \ 44 ${BSPDIR}/sources/poky/meta \
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 ?= " \
37 ${BSPDIR}/sources/meta-raspberrypi \ 37 ${BSPDIR}/sources/meta-raspberrypi \
38 ${BSPDIR}/sources/meta-toradex \ 38 ${BSPDIR}/sources/meta-toradex \
39 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 39 ${BSPDIR}/sources/meta-openembedded/meta-oe \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
@@ -45,6 +44,7 @@ BBLAYERS ?= " \
45 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \ 44 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
46 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \ 45 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
47 ${BSPDIR}/sources/meta-mingw \ 46 ${BSPDIR}/sources/meta-mingw \
47 ${BSPDIR}/sources/meta-qt5 \
48 " 48 "
49BBLAYERS_NON_REMOVABLE ?= " \ 49BBLAYERS_NON_REMOVABLE ?= " \
50 ${BSPDIR}/sources/poky/meta \ 50 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 35bbef2..20addb8 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 14bfb06..21d53e9 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -37,11 +37,11 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
43 ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
44 ${BSPDIR}/sources/meta-mingw \ 43 ${BSPDIR}/sources/meta-mingw \
44 ${BSPDIR}/sources/meta-qt5 \
45 " 45 "
46BBLAYERS_NON_REMOVABLE ?= " \ 46BBLAYERS_NON_REMOVABLE ?= " \
47 ${BSPDIR}/sources/poky/meta \ 47 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 411cde3..6cb549f 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -37,12 +37,12 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
44 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \ 43 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
45 ${BSPDIR}/sources/meta-mingw \ 44 ${BSPDIR}/sources/meta-mingw \
45 ${BSPDIR}/sources/meta-qt5 \
46 " 46 "
47BBLAYERS_NON_REMOVABLE ?= " \ 47BBLAYERS_NON_REMOVABLE ?= " \
48 ${BSPDIR}/sources/poky/meta \ 48 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 1c605d2..af7fcb3 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -69,6 +69,4 @@ IMAGE_CLASSES += "image_types_sdcard deploy-conf"
69LICENSE_CREATE_PACKAGE = "1" 69LICENSE_CREATE_PACKAGE = "1"
70COPY_LIC_MANIFEST = "1" 70COPY_LIC_MANIFEST = "1"
71 71
72QT_DIR_NAME = ""
73
74include conf/distro/include/${MACHINE}.conf 72include conf/distro/include/${MACHINE}.conf
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-23 23:46:39 +0000