[oe] [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure

[Samuli Piippo]

On 17.11.2015 00:03, Martin Jansa wrote:
> On Fri, Nov 06, 2015 at 03:20:09PM +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.
>> With include() on a separate line, oe-device-extra.pri is correctly
>> included also in configure.
>
> Please resend version applicable for 5.6 in master branch (this will be
> merged to jethro after more testing in master branch).

This still produces few warning lines to configure output. I wonder if 
it would be better to change the patch so that it creates an empty 
oe-device-extra.pri file? It would then always be available and easily 
patched/overwritten when needed.

-samuli

>> Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
>> ---
>>   recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> 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..0826ba1 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
>> @@ -45,9 +45,9 @@ Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
>>   ---
>>    configure                            |  70 +++++++++++++++---------
>>    mkspecs/features/configure.prf       |   4 +-
>> - mkspecs/linux-oe-g++/qmake.conf      |  42 +++++++++++++++
>> + mkspecs/linux-oe-g++/qmake.conf      |  44 +++++++++++++++
>>    mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
>> - 4 files changed, 188 insertions(+), 28 deletions(-)
>> + 4 files changed, 190 insertions(+), 28 deletions(-)
>>    create mode 100644 mkspecs/linux-oe-g++/qmake.conf
>>    create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
>>
>> @@ -200,7 +200,7 @@ new file mode 100644
>>   index 0000000..d0a4166
>>   --- /dev/null
>>   +++ b/mkspecs/linux-oe-g++/qmake.conf
>> -@@ -0,0 +1,42 @@
>> +@@ -0,0 +1,44 @@
>>   +#
>>   +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
>>   +#
>> @@ -240,7 +240,9 @@ 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)
>> ++exists(../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 at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>