[meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

When looking for Qt5 components and files we ought to use the Qt5
specific path. In case the distribution wants to have a flat tree it
can set QT_DIR_NAME and it will still works as expected.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
I have built two image and the SDK from scratch using this with no
issues. Could someone also give this a try?

 classes/qmake5_base.bbclass |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 3861cd0..ec0267a 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -57,20 +57,20 @@ do_generate_qt_config_file() {
     cat > ${QT_CONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
-Headers = ${OE_QMAKE_PATH_HEADERS}
+Headers = ${OE_QMAKE_PATH_QT_HEADERS}
 Libraries = ${OE_QMAKE_PATH_LIBS}
-ArchData = ${OE_QMAKE_PATH_ARCHDATA}
-Data = ${OE_QMAKE_PATH_DATA}
+ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}
+Data = ${OE_QMAKE_PATH_QT_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
 Imports = ${OE_QMAKE_PATH_IMPORTS}
 Qml2Imports = ${OE_QMAKE_PATH_QML}
-Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
-Documentation = ${OE_QMAKE_PATH_DOCS}
-Settings = ${OE_QMAKE_PATH_SETTINGS}
-Examples = ${OE_QMAKE_PATH_EXAMPLES}
-Tests = ${OE_QMAKE_PATH_TESTS}
+Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}
+Documentation = ${OE_QMAKE_PATH_QT_DOCS}
+Settings = ${OE_QMAKE_PATH_QT_SETTINGS}
+Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}
+Tests = ${OE_QMAKE_PATH_QT_TESTS}
 HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
 HostData = ${OE_QMAKE_PATH_HOST_DATA}
 HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
-- 
1.7.10.4

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

On Wed, Feb 19, 2014 at 12:22 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> When looking for Qt5 components and files we ought to use the Qt5
> specific path. In case the distribution wants to have a flat tree it
> can set QT_DIR_NAME and it will still works as expected.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> I have built two image and the SDK from scratch using this with no
> issues. Could someone also give this a try?

Today I rebuilt 5.2.1 image and SDK in two build machines (one Debian
Sid and another Debian 7.4 based) and both succeed.

Did someone try this one?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Urs Fässler]

On Mit, 2014-02-19 at 16:11 -0300, Otavio Salvador wrote:
> On Wed, Feb 19, 2014 at 12:22 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
> > When looking for Qt5 components and files we ought to use the Qt5
> > specific path. In case the distribution wants to have a flat tree it
> > can set QT_DIR_NAME and it will still works as expected.
> >
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> > I have built two image and the SDK from scratch using this with no
> > issues. Could someone also give this a try?
> 
> Today I rebuilt 5.2.1 image and SDK in two build machines (one Debian
> Sid and another Debian 7.4 based) and both succeed.
> 
> Did someone try this one?
> 

I successfully built Qt 5.2.1 (from the 5.2.1 repository, not the above
patch) for ARM on Debian 7.4. I had some problems with cmake stuff, but
not sure if this has to do with my configuration.


-- 
bytes at work
Konradstrasse 15
CH-8400 Winterthur
Switzerland

phone: +41 52 213 79 79
fax:   +41 52 203 27 13

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

On Thu, Feb 20, 2014 at 4:50 AM, Urs Fässler <urs@bytesatwork.ch> wrote:
> On Mit, 2014-02-19 at 16:11 -0300, Otavio Salvador wrote:
>> On Wed, Feb 19, 2014 at 12:22 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>> > When looking for Qt5 components and files we ought to use the Qt5
>> > specific path. In case the distribution wants to have a flat tree it
>> > can set QT_DIR_NAME and it will still works as expected.
>> >
>> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> > ---
>> > I have built two image and the SDK from scratch using this with no
>> > issues. Could someone also give this a try?
>>
>> Today I rebuilt 5.2.1 image and SDK in two build machines (one Debian
>> Sid and another Debian 7.4 based) and both succeed.
>>
>> Did someone try this one?
>>
>
> I successfully built Qt 5.2.1 (from the 5.2.1 repository, not the above
> patch) for ARM on Debian 7.4. I had some problems with cmake stuff, but
> not sure if this has to do with my configuration.

It may be related, can you elaborate so I can confirm at my side? Do
you have a test recipe for me to try?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Urs Fässler]

Am Donnerstag, den 20.02.2014, 08:57 -0300 schrieb Otavio Salvador:
> On Thu, Feb 20, 2014 at 4:50 AM, Urs Fässler <urs@bytesatwork.ch> wrote:
> > On Mit, 2014-02-19 at 16:11 -0300, Otavio Salvador wrote:
> >> On Wed, Feb 19, 2014 at 12:22 AM, Otavio Salvador
> >> <otavio@ossystems.com.br> wrote:
> >> > When looking for Qt5 components and files we ought to use the Qt5
> >> > specific path. In case the distribution wants to have a flat tree it
> >> > can set QT_DIR_NAME and it will still works as expected.
> >> >
> >> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> > ---
> >> > I have built two image and the SDK from scratch using this with no
> >> > issues. Could someone also give this a try?
> >>
> >> Today I rebuilt 5.2.1 image and SDK in two build machines (one Debian
> >> Sid and another Debian 7.4 based) and both succeed.
> >>
> >> Did someone try this one?
> >>
> >
> > I successfully built Qt 5.2.1 (from the 5.2.1 repository, not the above
> > patch) for ARM on Debian 7.4. I had some problems with cmake stuff, but
> > not sure if this has to do with my configuration.
> 
> It may be related, can you elaborate so I can confirm at my side? Do
> you have a test recipe for me to try?
> 

It was my fault, since I use Yocto 1.5 I did not had the current cmake
version. It now works.

-- 
bytes at work
Konradstrasse 15
CH-8400 Winterthur
Switzerland

phone: +41 52 213 79 79
fax:   +41 52 203 27 13

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Martin Jansa]

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

On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote:
> When looking for Qt5 components and files we ought to use the Qt5
> specific path. In case the distribution wants to have a flat tree it
> can set QT_DIR_NAME and it will still works as expected.

NAK

I don't think this is good idea, end-user applications shouldn't install
their data, archdata, examples etc in qt5 subdirectories.

https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers

If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME
and all qtmodules will fold into default directories and you won't need

OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"

listed in above wiki.

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> I have built two image and the SDK from scratch using this with no
> issues. Could someone also give this a try?
> 
>  classes/qmake5_base.bbclass |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 3861cd0..ec0267a 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -57,20 +57,20 @@ do_generate_qt_config_file() {
>      cat > ${QT_CONF_PATH} <<EOF
>  [Paths]
>  Prefix = ${OE_QMAKE_PATH_PREFIX}
> -Headers = ${OE_QMAKE_PATH_HEADERS}
> +Headers = ${OE_QMAKE_PATH_QT_HEADERS}
>  Libraries = ${OE_QMAKE_PATH_LIBS}
> -ArchData = ${OE_QMAKE_PATH_ARCHDATA}
> -Data = ${OE_QMAKE_PATH_DATA}
> +ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}
> +Data = ${OE_QMAKE_PATH_QT_DATA}
>  Binaries = ${OE_QMAKE_PATH_BINS}
>  LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
>  Plugins = ${OE_QMAKE_PATH_PLUGINS}
>  Imports = ${OE_QMAKE_PATH_IMPORTS}
>  Qml2Imports = ${OE_QMAKE_PATH_QML}
> -Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
> -Documentation = ${OE_QMAKE_PATH_DOCS}
> -Settings = ${OE_QMAKE_PATH_SETTINGS}
> -Examples = ${OE_QMAKE_PATH_EXAMPLES}
> -Tests = ${OE_QMAKE_PATH_TESTS}
> +Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}
> +Documentation = ${OE_QMAKE_PATH_QT_DOCS}
> +Settings = ${OE_QMAKE_PATH_QT_SETTINGS}
> +Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}
> +Tests = ${OE_QMAKE_PATH_QT_TESTS}
>  HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
>  HostData = ${OE_QMAKE_PATH_HOST_DATA}
>  HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
> -- 
> 1.7.10.4
> 
> _______________________________________________
> 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: 205 bytes --]

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

Martin,

On Thu, Feb 20, 2014 at 9:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote:
>> When looking for Qt5 components and files we ought to use the Qt5
>> specific path. In case the distribution wants to have a flat tree it
>> can set QT_DIR_NAME and it will still works as expected.
>
> NAK
>
> I don't think this is good idea, end-user applications shouldn't install
> their data, archdata, examples etc in qt5 subdirectories.
>
> https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers
>
> If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME
> and all qtmodules will fold into default directories and you won't need
>
> OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>
> listed in above wiki.

and what about we change just the headers? I want to avoid every
recipe using Qt5 and qmake to require setting the headers var.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

Hello,

On Thu, Feb 20, 2014 at 9:22 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Thu, Feb 20, 2014 at 9:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote:
>>> When looking for Qt5 components and files we ought to use the Qt5
>>> specific path. In case the distribution wants to have a flat tree it
>>> can set QT_DIR_NAME and it will still works as expected.
>>
>> NAK
>>
>> I don't think this is good idea, end-user applications shouldn't install
>> their data, archdata, examples etc in qt5 subdirectories.
>>
>> https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers
>>
>> If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME
>> and all qtmodules will fold into default directories and you won't need
>>
>> OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>>
>> listed in above wiki.
>
> and what about we change just the headers? I want to avoid every
> recipe using Qt5 and qmake to require setting the headers var.

Like this:

commit 0f8dc68b8bc8f129fbba4ee3692884f2324e9d28
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Tue Feb 18 14:03:49 2014 -0300

    qmake5_base.bbclass: Use Qt version path for headers

    When looking for Qt5 headers we ought to use the Qt5 specific path. In
    case the distribution wants to have a flat tree it can set QT_DIR_NAME
    and it will still works as expected.

    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 3861cd0..0cfb5a4 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -57,7 +57,7 @@ do_generate_qt_config_file() {
     cat > ${QT_CONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
-Headers = ${OE_QMAKE_PATH_HEADERS}
+Headers = ${OE_QMAKE_PATH_QT_HEADERS}
 Libraries = ${OE_QMAKE_PATH_LIBS}
 ArchData = ${OE_QMAKE_PATH_ARCHDATA}
 Data = ${OE_QMAKE_PATH_DATA}


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Martin Jansa]

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

On Thu, Feb 20, 2014 at 09:22:03AM -0300, Otavio Salvador wrote:
> Martin,
> 
> On Thu, Feb 20, 2014 at 9:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote:
> >> When looking for Qt5 components and files we ought to use the Qt5
> >> specific path. In case the distribution wants to have a flat tree it
> >> can set QT_DIR_NAME and it will still works as expected.
> >
> > NAK
> >
> > I don't think this is good idea, end-user applications shouldn't install
> > their data, archdata, examples etc in qt5 subdirectories.
> >
> > https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers
> >
> > If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME
> > and all qtmodules will fold into default directories and you won't need
> >
> > OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
> >
> > listed in above wiki.
> 
> and what about we change just the headers? I want to avoid every
> recipe using Qt5 and qmake to require setting the headers var.

That is still quite bad work around, because ideally end-user apps
shouldn't install headers in qt5 dirs as well.

So having this line explicitly in the recipe at least shows that app
headers will be installed in weird qt5 location (so your other recipes
should search for it there).
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

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

Re: [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

On Thu, Feb 20, 2014 at 9:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Feb 20, 2014 at 09:22:03AM -0300, Otavio Salvador wrote:
>> Martin,
>>
>> On Thu, Feb 20, 2014 at 9:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote:
>> >> When looking for Qt5 components and files we ought to use the Qt5
>> >> specific path. In case the distribution wants to have a flat tree it
>> >> can set QT_DIR_NAME and it will still works as expected.
>> >
>> > NAK
>> >
>> > I don't think this is good idea, end-user applications shouldn't install
>> > their data, archdata, examples etc in qt5 subdirectories.
>> >
>> > https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers
>> >
>> > If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME
>> > and all qtmodules will fold into default directories and you won't need
>> >
>> > OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>> >
>> > listed in above wiki.
>>
>> and what about we change just the headers? I want to avoid every
>> recipe using Qt5 and qmake to require setting the headers var.
>
> That is still quite bad work around, because ideally end-user apps
> shouldn't install headers in qt5 dirs as well.
>
> So having this line explicitly in the recipe at least shows that app
> headers will be installed in weird qt5 location (so your other recipes
> should search for it there).

If a system is splitting Qt5 and Qt4 I don't think this is wrong. I
understand your point but I think this causes no harm for user and
easy the general usage.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750