Patchwork classes/qmake2: export QMAKEPATH

login
register
mail settings
Submitter Jonathan Liu
Date June 6, 2013, 6:54 a.m.
Message ID <1370501684-26590-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/51203/
State Not Applicable, archived
Headers show

Comments

Jonathan Liu - June 6, 2013, 6:54 a.m.
QMAKEPATH is exported so that qmake is able to detect the webkit module,
load it and add it to the QT_CONFIG variable. The detection is done in
mkspecs/features/qt_config.prf which reads the qmake QMAKE_MKSPECS
builtin. qmake will read QMAKEPATH, append /mkspecs to it and prepend it
to the QMAKE_MKSPECS list builtin returned. qt_config.prf will then load
modules matching modules/qt_*.pri inside each directory in QMAKE_MKSPECS.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta/classes/qmake2.bbclass | 1 +
 1 file changed, 1 insertion(+)
Jonathan Liu - June 6, 2013, 7:34 a.m.
On 6 June 2013 16:54, Jonathan Liu <net147@gmail.com> wrote:
> QMAKEPATH is exported so that qmake is able to detect the webkit module,
> load it and add it to the QT_CONFIG variable. The detection is done in
> mkspecs/features/qt_config.prf which reads the qmake QMAKE_MKSPECS
> builtin. qmake will read QMAKEPATH, append /mkspecs to it and prepend it
> to the QMAKE_MKSPECS list builtin returned. qt_config.prf will then load
> modules matching modules/qt_*.pri inside each directory in QMAKE_MKSPECS.
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>  meta/classes/qmake2.bbclass | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
> index 8b9861c..03ad2f1 100644
> --- a/meta/classes/qmake2.bbclass
> +++ b/meta/classes/qmake2.bbclass
> @@ -5,6 +5,7 @@ inherit qmake_base
>
>  DEPENDS_prepend = "qt4-tools-native "
>
> +export QMAKEPATH = "${STAGING_DATADIR}/qt4"
>  export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
>  export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
>  export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
> --
> 1.8.2.3
>
This may be causing some packaging QA problems. I am investigating...

Regards,
Jonathan
Jonathan Liu - June 7, 2013, 2:05 a.m.
On 6 June 2013 17:34, Jonathan Liu <net147@gmail.com> wrote:
> On 6 June 2013 16:54, Jonathan Liu <net147@gmail.com> wrote:
>> QMAKEPATH is exported so that qmake is able to detect the webkit module,
>> load it and add it to the QT_CONFIG variable. The detection is done in
>> mkspecs/features/qt_config.prf which reads the qmake QMAKE_MKSPECS
>> builtin. qmake will read QMAKEPATH, append /mkspecs to it and prepend it
>> to the QMAKE_MKSPECS list builtin returned. qt_config.prf will then load
>> modules matching modules/qt_*.pri inside each directory in QMAKE_MKSPECS.
>>
>> Signed-off-by: Jonathan Liu <net147@gmail.com>
>> ---
>>  meta/classes/qmake2.bbclass | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
>> index 8b9861c..03ad2f1 100644
>> --- a/meta/classes/qmake2.bbclass
>> +++ b/meta/classes/qmake2.bbclass
>> @@ -5,6 +5,7 @@ inherit qmake_base
>>
>>  DEPENDS_prepend = "qt4-tools-native "
>>
>> +export QMAKEPATH = "${STAGING_DATADIR}/qt4"
>>  export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
>>  export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
>>  export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
>> --
>> 1.8.2.3
>>
> This may be causing some packaging QA problems. I am investigating...

Please disregard this patch. I will submit a different patch to fix.

Regards,
Jonathan

Patch

diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index 8b9861c..03ad2f1 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -5,6 +5,7 @@  inherit qmake_base
 
 DEPENDS_prepend = "qt4-tools-native "
 
+export QMAKEPATH = "${STAGING_DATADIR}/qt4"
 export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"