linux/poky.git/meta/recipes-qt/qt4/qt4-embedded.inc, branch 1.4_M4

qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf

2012-11-12T13:36:38+00:00

upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bjrn Erik Nilsen Date: Mon Aug 9 14:07:01 2010 +0200 Remove dependency of OpenGL Utility Library (GLU). GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim (From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie

PACKAGES_DYNAMIC: use regexp not glob

2012-10-19T17:02:26+00:00

* bitbake uses PACKAGES_DYNAMIC as regexp ^ could make matching faster (and it will be more clear that we're expecting regexp not glob) * made all those last '-' optional, use .* (or nothing) (From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie

qt4: use extra variable for more QT_CONFIG_FLAGS fragments

2012-10-18T11:13:47+00:00

* qt4-embedded was forcing -DQT_KEYPAD_NAVIGATION which depends on feature-completer * separate variable makes it easier to not enable QT_KEYPAD_NAVIGATION in some upper layer where we have disabled feature-completer (From OE-Core rev: 0479242a18661cb7fc3d76d208c82fe6ae4378ce) Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie

qt4: Avoid circular dependencies with multilib

2012-10-03T09:02:21+00:00

Without this, circular dependencies are found when attempting to build multilib versions of qt4 (or bitbake world in a multilib enabled build). (From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e) Signed-off-by: Richard Purdie

qt4: PR bumps

2012-10-02T16:19:28+00:00

* sofar only formal changes, but to test that everything still builds the same (From OE-Core rev: 054a0e6c850f92c03fbb6314702de4e6318ccd25) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie

qt4: Update qt4.inc to remove staticdev deps in -dbg packages

2012-09-12T14:13:36+00:00

It appears that the qt4.inc had a copy/paste error relating to creating a list of staticdev packages, that caused them to show up as dependencies in the -dbg package. (From OE-Core rev: a7c5cec5fc63b4a26d84673460426b35669068dc) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie

qt4: make font packaging specific to embedded version

2012-07-31T07:02:10+00:00

Qt 4's lib/fonts files are intended only for installation with Qt Embedded [1] so only install and package them with the embedded version. Fixes [YOCTO #2809]. [1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html (From OE-Core rev: 64369219e3e03cacfaef8df6e3eec507140bdd7d) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

qt4: allow recipes building commercial edition

2012-07-31T07:02:09+00:00

To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things: * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same. * Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition. * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial". Fixes [YOCTO #2505]. (From OE-Core rev: 2be0058fc4acddab611637656183accd052b40eb) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

2012-06-18T12:24:58+00:00

After the change to shell style functions (from python style), the ability to use oe_filter_out on QT_CONFIG_FLAGS got broken. This patch solves that by referring to QT_ARCH in a more correct way. (From OE-Core rev: abd5d5a712686a379a1a1da29d78a0f374f13e33) Signed-off-by: Anders Darander Signed-off-by: Richard Purdie

qt4: move functions from python to shell style

2012-05-08T13:49:14+00:00

In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] [RP: Fix whitepace] (From OE-Core rev: 977ba301a1063a84b865ddf7367c35827fbffc86) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie