summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/qt5-layer
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/qt5-layer')
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend22
1 files changed, 0 insertions, 22 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index e0979bf5..2803d0a4 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -9,9 +9,6 @@ HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
9IS_MX6SL = "0" 9IS_MX6SL = "0"
10IS_MX6SL_mx6sl = "1" 10IS_MX6SL_mx6sl = "1"
11 11
12PACKAGECONFIG_GL_mx5 = "gles2"
13QT_CONFIG_FLAGS_append_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
14
15PACKAGECONFIG_GL_mx6q = "gles2" 12PACKAGECONFIG_GL_mx6q = "gles2"
16PACKAGECONFIG_GL_mx6dl = "gles2" 13PACKAGECONFIG_GL_mx6dl = "gles2"
17PACKAGECONFIG_GL_mx6sx = "gles2" 14PACKAGECONFIG_GL_mx6sx = "gles2"
@@ -22,25 +19,6 @@ QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no
22QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \ 19QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
23 ' -no-opengl -linuxfb -no-eglfs', d)}" 20 ' -no-opengl -linuxfb -no-eglfs', d)}"
24 21
25do_configure_prepend_mx5() {
26 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
27
28 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
29IMX5_CFLAGS = -D_LINUX=1
30QMAKE_LIBS_EGL += -lEGL
31QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
32QMAKE_LIBS_OPENVG += -lOpenVG -lEGL
33
34QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS
35QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
36QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS
37QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
38
39load(qt_config)
40
41EOF
42}
43
44do_configure_prepend_mx6() { 22do_configure_prepend_mx6() {
45 # adapt qmake.conf to our needs 23 # adapt qmake.conf to our needs
46 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 24 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf