[meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally

[meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally

[Samuli Piippo]

configure parses through the mkspec, but does not handle conditions
at all, so oe-device-extra.pri was not included at configure phase.
For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
include() is conditional and won't break build even when
oe-device-extra.pri does not exist.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a9c448d..d377921 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -240,7 +240,7 @@ index 0000000..d0a4166
 +# for the SDK
 +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
 +
-+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
++include(../oe-device-extra.pri)
 +
 +load(qt_config)
 diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
-- 
1.9.1

Re: [meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]

On Mon, Nov 02, 2015 at 04:03:41PM +0200, Samuli Piippo wrote:
> configure parses through the mkspec, but does not handle conditions
> at all, so oe-device-extra.pri was not included at configure phase.
> For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
> include() is conditional and won't break build even when
> oe-device-extra.pri does not exist.

And now every log.do_configure shows:
DEBUG: Executing shell function do_configure
Cannot read /OE/build/owpb/webos-ports/tmp-glibc/sysroots/qemux86/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory

Which can confuse some people.. :/

> 
> Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
> ---
>  recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
> index a9c448d..d377921 100644
> --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
> +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
> @@ -240,7 +240,7 @@ index 0000000..d0a4166
>  +# for the SDK
>  +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
>  +
> -+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
> ++include(../oe-device-extra.pri)
>  +
>  +load(qt_config)
>  diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally

[Samuli Piippo]

And even more confusing when using qmake from external toolchain. I'll 
prepare a new patch for this.

-samuli

On 05.11.2015 21:46, Martin Jansa wrote:
> On Mon, Nov 02, 2015 at 04:03:41PM +0200, Samuli Piippo wrote:
>> configure parses through the mkspec, but does not handle conditions
>> at all, so oe-device-extra.pri was not included at configure phase.
>> For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
>> include() is conditional and won't break build even when
>> oe-device-extra.pri does not exist.
>
> And now every log.do_configure shows:
> DEBUG: Executing shell function do_configure
> Cannot read /OE/build/owpb/webos-ports/tmp-glibc/sysroots/qemux86/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory
>
> Which can confuse some people.. :/
>
>>
>> Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
>> ---
>>   recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
>> index a9c448d..d377921 100644
>> --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
>> +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
>> @@ -240,7 +240,7 @@ index 0000000..d0a4166
>>   +# for the SDK
>>   +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
>>   +
>> -+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
>> ++include(../oe-device-extra.pri)
>>   +
>>   +load(qt_config)
>>   diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>