[meta-qt5][PATCH] qmake5_base: Add QT_DIR_NAME to "Headers"

[meta-qt5][PATCH] qmake5_base: Add QT_DIR_NAME to "Headers"

[Søren Holm]

Without this we get Headers = "/usr/include" which is not meaningfull
since is is searched by defaukt. What we realy want is "/usr/local${QT_DIR_NAME}"
which is my default "qt5" giving "/usr/include/qt5".

Signed-off-by: Søren Holm <sgh@sgh.dk>
---
 classes/qmake5_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 2db0fa3..24c1483 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -56,7 +56,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_HEADERS}/${QT_DIR_NAME}
 Libraries = ${OE_QMAKE_PATH_LIBS}
 ArchData = ${OE_QMAKE_PATH_ARCHDATA}
 Data = ${OE_QMAKE_PATH_DATA}
-- 
1.9.0

Re: [meta-qt5][PATCH] qmake5_base: Add QT_DIR_NAME to "Headers"

[Søren Holm]

If it can be applied to master I'd like to have this applied to "dora" as 
well.

-- 
Søren Holm

Re: [meta-qt5][PATCH] qmake5_base: Add QT_DIR_NAME to "Headers"

[Martin Jansa]

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

On Tue, Mar 11, 2014 at 01:54:57PM +0100, Søren Holm wrote:
> Without this we get Headers = "/usr/include" which is not meaningfull
> since is is searched by defaukt. What we realy want is "/usr/local${QT_DIR_NAME}"
> which is my default "qt5" giving "/usr/include/qt5".

Please see discussion about this patch which is already applied:
https://github.com/meta-qt5/meta-qt5/commit/2bd5fba34dd350807ac07828cd883d5b6c7ec631

> 
> Signed-off-by: Søren Holm <sgh@sgh.dk>
> ---
>  classes/qmake5_base.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 2db0fa3..24c1483 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -56,7 +56,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_HEADERS}/${QT_DIR_NAME}
>  Libraries = ${OE_QMAKE_PATH_LIBS}
>  ArchData = ${OE_QMAKE_PATH_ARCHDATA}
>  Data = ${OE_QMAKE_PATH_DATA}
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> 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: Add QT_DIR_NAME to "Headers"

[Søren Holm]

Oh!! That just excellent then. Can it be applied on to "dora" please?

Tirsdag den 11. marts 2014 14:17:04 skrev Martin Jansa:
> On Tue, Mar 11, 2014 at 01:54:57PM +0100, Søren Holm wrote:
> > Without this we get Headers = "/usr/include" which is not meaningfull
> > since is is searched by defaukt. What we realy want is
> > "/usr/local${QT_DIR_NAME}" which is my default "qt5" giving
> > "/usr/include/qt5".
> 
> Please see discussion about this patch which is already applied:
> https://github.com/meta-qt5/meta-qt5/commit/2bd5fba34dd350807ac07828cd883d5b
> 6c7ec631
> > Signed-off-by: Søren Holm <sgh@sgh.dk>
> > ---
> > 
> >  classes/qmake5_base.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> > index 2db0fa3..24c1483 100644
> > --- a/classes/qmake5_base.bbclass
> > +++ b/classes/qmake5_base.bbclass
> > @@ -56,7 +56,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_HEADERS}/${QT_DIR_NAME}
> > 
> >  Libraries = ${OE_QMAKE_PATH_LIBS}
> >  ArchData = ${OE_QMAKE_PATH_ARCHDATA}
> >  Data = ${OE_QMAKE_PATH_DATA}

-- 
Søren Holm