summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qtbase.inc16
1 files changed, 11 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 139811f6..3e471517 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -15,16 +15,16 @@ SRC_URI += " \
15 file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ 15 file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
16" 16"
17 17
18DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" 18DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}"
19 19
20# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h 20# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
21XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" 21# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
22# reenable when we switch to "-qt-xcb" and build of 22# reenable when we switch to "-qt-xcb" and build of
23# DEPENDS += "${XCB_DEPENDS}"
24# QT_XCB = "-qt-xcb" 23# QT_XCB = "-qt-xcb"
25# src/platformsupport/glxconvenience/ is resolved to be before build of 24# src/platformsupport/glxconvenience/ is resolved to be before build of
26# src/plugins/platforms/xcb/ 25# src/plugins/platforms/xcb/
27 26
27XCB_DEPENDS ?= ""
28QT_XCB ?= "-no-xcb" 28QT_XCB ?= "-no-xcb"
29 29
30QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" 30QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
@@ -33,7 +33,13 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm"
33# Some can be used only for certain QT_MODULEs, so define them here, 33# Some can be used only for certain QT_MODULEs, so define them here,
34# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc 34# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc
35QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" 35QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
36QT_GLFLAGS ?= "" 36
37# if you want to enable egl/gles2 in your .bbappend, don't forget to add right dependencies, e.g.
38# GL_DEPENDS = "virtual/libgles2 virtual/libegl"
39# QT_GLFLAGS = "-opengl es2 -eglfs"
40GL_DEPENDS ?= "virtual/libgl"
41QT_GLFLAGS ?= "-opengl"
42
37QT_XML ?= "-xmlpatterns" 43QT_XML ?= "-xmlpatterns"
38QT_WEBKIT ?= "-webkit" 44QT_WEBKIT ?= "-webkit"
39QT_PHONON ?= "-phonon" 45QT_PHONON ?= "-phonon"
@@ -70,7 +76,7 @@ QT_CONFIG_FLAGS += " \
70 ${QT_DEMOS} \ 76 ${QT_DEMOS} \
71" 77"
72 78
73INC_PR = "r0" 79INC_PR = "r1"
74 80
75# Qt uses atomic instructions not supported in thumb mode 81# Qt uses atomic instructions not supported in thumb mode
76ARM_INSTRUCTION_SET = "arm" 82ARM_INSTRUCTION_SET = "arm"