Patchwork [PATCHv2] qt4e: override variables OE_QMAKE_QT_CONFIG

login
register
mail settings
Submitter Martin Jansa
Date June 29, 2013, 12:19 p.m.
Message ID <1372508358-1839-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/52691/
State Superseded, archived
Headers show

Comments

Martin Jansa - June 29, 2013, 12:19 p.m.
From: Wills Wang <wills.wang.open@gmail.com>

override variables OE_QMAKE_QT_CONFIG to compile Qt/Embedded apps

Signed-off-by: Wills Wang <wills.wang.open@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/qt4e.bbclass | 1 +
 1 file changed, 1 insertion(+)
Jonathan Liu - July 3, 2013, 9:43 a.m.
On 29/06/2013 10:19 PM, Martin Jansa wrote:
> From: Wills Wang <wills.wang.open@gmail.com>
>
> override variables OE_QMAKE_QT_CONFIG to compile Qt/Embedded apps
>
> Signed-off-by: Wills Wang <wills.wang.open@gmail.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   meta/classes/qt4e.bbclass | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
> index d7f5df8..850bb6a 100644
> --- a/meta/classes/qt4e.bbclass
> +++ b/meta/classes/qt4e.bbclass
> @@ -9,6 +9,7 @@ QT_LIBINFIX = "E"
>   # override variables set by qmake-base to compile Qt/Embedded apps
>   #
>   export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
> +export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri"
>   export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
>   export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
>   export OE_QMAKE_LIBS_QT = "qt"
An earlier patch for this was already submitted and merged:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=85f0cf943d3165a603ccb058d838bc0b6a80ce43

Regards,
Jonathan

Patch

diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index d7f5df8..850bb6a 100644
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -9,6 +9,7 @@  QT_LIBINFIX = "E"
 # override variables set by qmake-base to compile Qt/Embedded apps
 #
 export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri"
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"