diff options
Diffstat (limited to 'dynamic-layers/qt5-layer/recipes-qt/qt5')
-rw-r--r-- | dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 22 |
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)}" | |||
9 | IS_MX6SL = "0" | 9 | IS_MX6SL = "0" |
10 | IS_MX6SL_mx6sl = "1" | 10 | IS_MX6SL_mx6sl = "1" |
11 | 11 | ||
12 | PACKAGECONFIG_GL_mx5 = "gles2" | ||
13 | QT_CONFIG_FLAGS_append_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" | ||
14 | |||
15 | PACKAGECONFIG_GL_mx6q = "gles2" | 12 | PACKAGECONFIG_GL_mx6q = "gles2" |
16 | PACKAGECONFIG_GL_mx6dl = "gles2" | 13 | PACKAGECONFIG_GL_mx6dl = "gles2" |
17 | PACKAGECONFIG_GL_mx6sx = "gles2" | 14 | PACKAGECONFIG_GL_mx6sx = "gles2" |
@@ -22,25 +19,6 @@ QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no | |||
22 | QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \ | 19 | QT_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 | ||
25 | do_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 | ||
29 | IMX5_CFLAGS = -D_LINUX=1 | ||
30 | QMAKE_LIBS_EGL += -lEGL | ||
31 | QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL | ||
32 | QMAKE_LIBS_OPENVG += -lOpenVG -lEGL | ||
33 | |||
34 | QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS | ||
35 | QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS | ||
36 | QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS | ||
37 | QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS | ||
38 | |||
39 | load(qt_config) | ||
40 | |||
41 | EOF | ||
42 | } | ||
43 | |||
44 | do_configure_prepend_mx6() { | 22 | do_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 |