diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-02-18 21:57:57 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-19 15:55:39 +0100 |
| commit | d9c741cce23ed6ff741ed67b77f57e04e5b440b8 (patch) | |
| tree | f8a78052e2c10acc827cf2a316fa5da2fe4fca26 /recipes-qt/qt5/qtbase.inc | |
| parent | f90537a7decfa5599606d3290bc25de02bfa5796 (diff) | |
qmake5: don't always look in directories recursively
QT needs to be compiled without the -r parameter from the qmake command
line. This is necessary to avoid those errors when building
qtdeclarative or qt3d without opengl for example:
Project ERROR: Unknown module(s) in QT: quick-private
or
Project ERROR: Unknown module(s) in QT: quick
Also update comments regarding the dependencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase.inc')
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index cbb8e4f2..da60b767 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -29,8 +29,6 @@ RDEPENDS_${PN}-tools += "perl" # PACKAGECONFIG is kept rather minimal for people who don't need # stuff like webkit (and it's easier to add options than remove) -# gl or gles needs to be enabled in order to build qtdeclarative -# http://qt.gitorious.org/qt/qtdeclarative/commit/e988998a08b1420ed10bd02d9d4b3b8ed2289df9 PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle xkb', '', d)}" @@ -76,7 +74,6 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" -# gl or gles2 is needed in order to build qtdeclarative (qtdeclarative.do_configure fails to find quick module without) PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" @@ -114,7 +111,7 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" -# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) +# needed for qtwebkit PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected |