[meta-qt5][PATCH 1/4] qmake5_base.bbclass: Use Qt version path for headers

[meta-qt5][PATCH 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Otavio Salvador]

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>
---
 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 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}
-- 
1.7.10.4

[meta-qt5][PATCH 2/4] mallit-framework-qt5: Don't set OE_QMAKE_PATH_HEADERS

[Otavio Salvador]

The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/maliit/maliit-framework-qt5_git.bb |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index b6d8cb3..633bf6e 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -6,12 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
 
 inherit qmake5
 
-# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir}
-# but
-# actually it is ${includedir}/qt5
-OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
-
-
 SRC_URI = "git://github.com/maliit/framework.git;branch=master \
     file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
     file://maliit-server.desktop \
-- 
1.7.10.4

[meta-qt5][PATCH 3/4] mallit-plugins-qt5: Don't set OE_QMAKE_PATH_HEADERS

[Otavio Salvador]

The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/maliit/maliit-plugins-qt5_git.bb |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
index 273b3e4..7dc1a73 100644
--- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
@@ -6,11 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621"
 
 inherit qmake5
 
-# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir}
-# but
-# actually it is ${includedir}/qt5
-OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
-
 DEPENDS = "maliit-framework-qt5"
 
 RDEPENDS_${PN} += "qtsvg-plugins"
-- 
1.7.10.4

[meta-qt5][PATCH 4/4] qsiv: add the qsiv 1.1 example app

[Otavio Salvador]

From: Giulian Gonçalves Vivan <giulian@ossystems.com.br>

This provides a simple image viewer for demonstration purposes.

Signed-off-by: Giulian Gonçalves Vivan <giulian@ossystems.com.br>
---
 recipes-qt/qsiv/qsiv_1.1.bb |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 recipes-qt/qsiv/qsiv_1.1.bb

diff --git a/recipes-qt/qsiv/qsiv_1.1.bb b/recipes-qt/qsiv/qsiv_1.1.bb
new file mode 100644
index 0000000..bb2efa6
--- /dev/null
+++ b/recipes-qt/qsiv/qsiv_1.1.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Qt Simple Image Viewer"
+DESCRIPTION = "A simple image viewer using a mix of C++ and qml code for demonstration."
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=11c7965a9059e287de5d93b98adf6d1a"
+DEPENDS = "qtdeclarative"
+
+SRCREV = "7b9810b0f02f9ac74fae3ead6e2e9fb5c1382173"
+SRC_URI = "git://code.ossystems.com.br/qt/qsiv;protocol=http"
+
+S = "${WORKDIR}/git"
+
+inherit qmake5
+
+EXTRA_QMAKEVARS_PRE += "target.path=${libdir}/${P}"
+
+do_install_append() {
+    install -d ${D}${bindir}
+    echo "#!/bin/sh" > ${D}${bindir}/qsiv
+    echo "export QML_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv
+    echo "export QML2_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv
+    echo "${libdir}/${P}/qsiv \$* " >> ${D}${bindir}/qsiv
+    chmod +x ${D}${bindir}/qsiv
+}
+
+FILES_${PN} += "${libdir}/${P}"
+RDEPENDS_${PN} += "qtdeclarative-qmlplugins"
+
+FILES_${PN}-dbg += "${libdir}/${P}/.debug"
-- 
1.7.10.4

Re: [meta-qt5][PATCH 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Denys Dmytriyenko]

On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
> 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>

Acked-by: Denys Dmytriyenko <denys@ti.com>

Martin,

Thinking about what you said in that Wiki section - I believe the number of 
apps consuming headers from /usr/include/qt5 is much higher than number of 
non-Qt5 libs/modules potentially installing headers in there... So, we 
shouldn't require every app recipe to set PATH_HEADERS properly.


> ---
>  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 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}
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-qt5][PATCH 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Otavio Salvador]

On Fri, Feb 21, 2014 at 6:12 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
>> 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>
>
> Acked-by: Denys Dmytriyenko <denys@ti.com>
>
> Martin,
>
> Thinking about what you said in that Wiki section - I believe the number of
> apps consuming headers from /usr/include/qt5 is much higher than number of
> non-Qt5 libs/modules potentially installing headers in there... So, we
> shouldn't require every app recipe to set PATH_HEADERS properly.

I agree with Denys here.

-- 
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 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Martin Jansa]

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

On Fri, Feb 21, 2014 at 04:12:07PM -0500, Denys Dmytriyenko wrote:
> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
> > 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>
> 
> Acked-by: Denys Dmytriyenko <denys@ti.com>
> 
> Martin,
> 
> Thinking about what you said in that Wiki section - I believe the number of 
> apps consuming headers from /usr/include/qt5 is much higher than number of 
> non-Qt5 libs/modules potentially installing headers in there... So, we 
> shouldn't require every app recipe to set PATH_HEADERS properly.

Setting OE_QMAKE_PATH_HEADERS is simple oneline change:
OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"

undoing this implementation isn't, if you really want to change
OE_QMAKE_PATH_HEADERS then include QT_DIR_NAME in it, but leave
OE_QMAKE_PATH_QT_HEADERS alone.

> >  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 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}
> > -- 
> > 1.7.10.4
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> _______________________________________________
> 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 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Otavio Salvador]

On Sat, Feb 22, 2014 at 3:37 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Feb 21, 2014 at 04:12:07PM -0500, Denys Dmytriyenko wrote:
>> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
>> > 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>
>>
>> Acked-by: Denys Dmytriyenko <denys@ti.com>
>>
>> Martin,
>>
>> Thinking about what you said in that Wiki section - I believe the number of
>> apps consuming headers from /usr/include/qt5 is much higher than number of
>> non-Qt5 libs/modules potentially installing headers in there... So, we
>> shouldn't require every app recipe to set PATH_HEADERS properly.
>
> Setting OE_QMAKE_PATH_HEADERS is simple oneline change:
> OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>
> undoing this implementation isn't, if you really want to change
> OE_QMAKE_PATH_HEADERS then include QT_DIR_NAME in it, but leave
> OE_QMAKE_PATH_QT_HEADERS alone.

Ok; I will rework the patches and send a v2.

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