Patchwork qt: updated qmake2 class to export qconfig.pri mkspec

login
register
mail settings
Submitter eu@felipetonello.com
Date May 9, 2013, 6:15 p.m.
Message ID <1368123358-10995-1-git-send-email-eu@felipetonello.com>
Download mbox | patch
Permalink /patch/49667/
State Accepted
Commit 9bb1ba46952321b3d6dff50d08cb0693505d3b8f
Headers show

Comments

eu@felipetonello.com - May 9, 2013, 6:15 p.m.
From: "Felipe F. Tonello" <eu@felipetonello.com>

This is necessary when Qt applicatins want to know variables such as
QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, gcc version etc.

OBS: This change made the build system crazy. When I changed it and run
bitbake my-qt-app-recipe, qmake was consuming 100% cpu usage for long time. I
had to stop it. So I recommend rebuild the entire Qt stack when changing this.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
 meta/classes/qmake2.bbclass | 1 +
 1 file changed, 1 insertion(+)
Otavio Salvador - May 15, 2013, 4:31 p.m.
On Thu, May 9, 2013 at 3:15 PM,  <eu@felipetonello.com> wrote:
> From: "Felipe F. Tonello" <eu@felipetonello.com>
>
> This is necessary when Qt applicatins want to know variables such as
> QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, gcc version etc.
>
> OBS: This change made the build system crazy. When I changed it and run
> bitbake my-qt-app-recipe, qmake was consuming 100% cpu usage for long time. I
> had to stop it. So I recommend rebuild the entire Qt stack when changing this.
>
> Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
> ---
>  meta/classes/qmake2.bbclass | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
> index 5eebd8e..8b9861c 100644
> --- a/meta/classes/qmake2.bbclass
> +++ b/meta/classes/qmake2.bbclass
> @@ -6,6 +6,7 @@ inherit qmake_base
>  DEPENDS_prepend = "qt4-tools-native "
>
>  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"
>  export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
>  export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"

The patch makes a lot of sense for me, Paul?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Paul Eggleton - May 15, 2013, 4:39 p.m.
On Wednesday 15 May 2013 13:31:41 Otavio Salvador wrote:
> On Thu, May 9, 2013 at 3:15 PM,  <eu@felipetonello.com> wrote:
> > From: "Felipe F. Tonello" <eu@felipetonello.com>
> > 
> > This is necessary when Qt applicatins want to know variables such as
> > QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, gcc version etc.
> > 
> > OBS: This change made the build system crazy. When I changed it and run
> > bitbake my-qt-app-recipe, qmake was consuming 100% cpu usage for long
> > time. I had to stop it. So I recommend rebuild the entire Qt stack when
> > changing this.
> > 
> > Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
> > ---
> > 
> >  meta/classes/qmake2.bbclass | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
> > index 5eebd8e..8b9861c 100644
> > --- a/meta/classes/qmake2.bbclass
> > +++ b/meta/classes/qmake2.bbclass
> > @@ -6,6 +6,7 @@ inherit qmake_base
> > 
> >  DEPENDS_prepend = "qt4-tools-native "
> >  
> >  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"
> >  export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
> >  export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
> 
> The patch makes a lot of sense for me, Paul?

I'm not sure I know enough about this to say either way; the comment about 
qmake going crazy doesn't exactly inspire confidence though...

I guess one question I would have is why have we not needed this before?

Cheers,
Paul
eu@felipetonello.com - May 15, 2013, 10:18 p.m.
Hi Paul,

On Wednesday, May 15, 2013 05:39:38 PM Paul Eggleton wrote:
> On Wednesday 15 May 2013 13:31:41 Otavio Salvador wrote:
> > On Thu, May 9, 2013 at 3:15 PM,  <eu@felipetonello.com> wrote:
> > > From: "Felipe F. Tonello" <eu@felipetonello.com>
> > > 
> > > This is necessary when Qt applicatins want to know variables such as
> > > QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, gcc version etc.
> > > 
> > > OBS: This change made the build system crazy. When I changed it and run
> > > bitbake my-qt-app-recipe, qmake was consuming 100% cpu usage for long
> > > time. I had to stop it. So I recommend rebuild the entire Qt stack when
> > > changing this.
> > > 
> > > Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
> > > ---
> > > 
> > >  meta/classes/qmake2.bbclass | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
> > > index 5eebd8e..8b9861c 100644
> > > --- a/meta/classes/qmake2.bbclass
> > > +++ b/meta/classes/qmake2.bbclass
> > > @@ -6,6 +6,7 @@ inherit qmake_base
> > > 
> > >  DEPENDS_prepend = "qt4-tools-native "
> > >  
> > >  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"
> > >  export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
> > >  export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
> > 
> > The patch makes a lot of sense for me, Paul?
> 
> I'm not sure I know enough about this to say either way; the comment about
> qmake going crazy doesn't exactly inspire confidence though...

About that I'm not sure why it happened. But after cleaning all Qt related 
builds it worked as expected.

> 
> I guess one question I would have is why have we not needed this before?

This is been used in the Qt based SDK. It's necessary to build Qt applications 
or libraries that makes use of those cited variables in their Qt project file.

Patch

diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index 5eebd8e..8b9861c 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -6,6 +6,7 @@  inherit qmake_base
 DEPENDS_prepend = "qt4-tools-native "
 
 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"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"