All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure
@ 2015-11-06 13:20 Samuli Piippo
  2015-11-16 22:03 ` Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Samuli Piippo @ 2015-11-06 13:20 UTC (permalink / raw)
  To: openembedded-devel

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.

Signed-off-by: Samuli Piippo <samuli.piippo@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@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



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure
  2015-11-06 13:20 [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure Samuli Piippo
@ 2015-11-16 22:03 ` Martin Jansa
  2015-11-17 14:28   ` Samuli Piippo
  0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2015-11-16 22:03 UTC (permalink / raw)
  To: openembedded-devel

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

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).

> Signed-off-by: Samuli Piippo <samuli.piippo@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@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@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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure
  2015-11-16 22:03 ` Martin Jansa
@ 2015-11-17 14:28   ` Samuli Piippo
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Piippo @ 2015-11-17 14:28 UTC (permalink / raw)
  To: openembedded-devel

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@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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-17 14:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-06 13:20 [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure Samuli Piippo
2015-11-16 22:03 ` Martin Jansa
2015-11-17 14:28   ` Samuli Piippo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.