Add OE_QMAKE_INCDIR_QT

This adds OE_QMAKE_INCDIR_QT to the variables in qmake5_base.bbclass.

Qt4 in oe-core exports this variables, both in their qt4 bbclasses as well as in their SDK. As a result, recipes like e.g. qextserialport [1] in meta-oe, uses OE_QMAKE_INCDIR_QT in the generated extserialport.prf file, in order allow both bitbake build recipes and applications build using the SDK, find the header filer of qextserialport.

In Qt5, OE_QMAKE_INCDIR_QT is not set when building using bitbake, however, that variable is still set in the environment file for the generated SDK.

Thus, to make the use case in e.g. [1] work also for Qt5, we'll add this variable to qmake5_base.bbclass. This will sync up the two use-cases.

[1] http://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb

The following changes since commit 9a4c0b393bf031acace5c2cc00d625a24c639d1c:

maliit-framework-qt5: Update SRCREV (2014-10-21 15:33:05 +0200)

are available in the git repository at:

git://github.com/darander/meta-qt5 9a0b3d2f7e1ac7e854430fe1e93271c71f574083
https://github.com/darander/meta-qt5/tree/qtsdk

Anders Darander (1):
qmake5: set OE_QMAKE_INCDIR_QT

 classes/qmake5_base.bbclass | 1 +
 1 file changed, 1 insertion(+)

2.1.1

This is set when generation an SDK, and thus would be usefull to have also when bitbaking. That allows us to use this in *.prf files which is used both when bitbaking as well as when using the SDK.

---
 classes/qmake5_base.bbclass | 1 +
 1 file changed, 1 insertion(+)

index 3861cd0..f1a0945 100644
@@ -32,6 +32,7 @@ EXTRA_OEMAKE = " \
     OE_QMAKE_AR='${OE_QMAKE_AR}' \
     OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \
     OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \
+    OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "
 
 OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}"

2.1.1

ping

Anders Darander
ChargeStorm AB / eStorm AB