[PATCH 1/5] qt-tstat: fix Makefile to support build outside of source, i.e. ${S} != ${B}

[PATCH 1/5] qt-tstat: fix Makefile to support build outside of source, i.e. ${S} != ${B}

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 ...file.build-for-when-build-dir-is-not-the-.patch | 35 ++++++++++++++++++++++
 .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  9 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch

diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch
new file mode 100644
index 0000000..3ceb74a
--- /dev/null
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch
@@ -0,0 +1,35 @@
+From 00666002c48ebbb21e73eb9fbe90615cef87cc11 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 14 Oct 2013 18:53:28 -0400
+Subject: [PATCH] Update Makefile.build for when build dir is not the same as
+ source dir
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ Makefile.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.build b/Makefile.build
+index 18892d4..72b8e34 100644
+--- a/Makefile.build
++++ b/Makefile.build
+@@ -2,6 +2,7 @@
+ 
+ ENV_SETUP ?= ../../linux-devkit/environment-setup
+ DESTDIR ?= 
++BUILDDIR ?= .
+ PLATFORM ?= 
+ MATRIX_APP_DIR ?= /usr/share/matrix-gui-2.0/apps/
+ PLATFORM_DEFINE ?= "Platform_${PLATFORM}"
+@@ -28,7 +29,7 @@ clean : ${SOURCES} qmake
+ 
+ install_common:
+ 	@install -d ${DESTDIR}/usr/bin 
+-	@install -m 0755 ThermostatDemo ${DESTDIR}/usr/bin/ThermostatDemo
++	@install -m 0755 ${BUILDDIR}/ThermostatDemo ${DESTDIR}/usr/bin/ThermostatDemo
+ 	@install -d ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
+ 	@cp -rf matrix-files/*  ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
+ 
+-- 
+1.8.3.2
+
diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
index 19c29fb..198ef1f 100644
--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
@@ -10,12 +10,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
 
 require recipes-core/matrix/matrix-gui-paths.inc
 
-PR = "r3"
+PR = "r4"
 
 BRANCH ?= "master"
 SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
 
-SRC_URI = "git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git"
+SRC_URI = " \
+	git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \
+	file://0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch \
+"
 
 S = "${WORKDIR}/git/"
 
@@ -23,7 +26,7 @@ inherit qt4e
 
 # use the make targets already created in the Makefile.build files
 do_install() {
-	make -f Makefile.build DESTDIR=${D} install_common
+	cd ${S} && make -f Makefile.build DESTDIR=${D} BUILDDIR=${B} install_common
 }
 
 PACKAGES += "matrix-gui-thermostat-demo"
-- 
1.8.3.2

[PATCH 2/5] qt-provider: expand with extra dependency variables for qtsvg and qtscript

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/classes/qt-provider.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-arago-distro/classes/qt-provider.bbclass
index 444c76a..c0f7184 100644
--- a/meta-arago-distro/classes/qt-provider.bbclass
+++ b/meta-arago-distro/classes/qt-provider.bbclass
@@ -11,9 +11,13 @@ QT_PROVIDER ?= "qt4e"
 
 inherit ${QT_PROVIDER}
 
-# Build-time dependencies
+# Build-time dependencies - those are now separate modules in Qt5 and
+# require separate dependencies, unlike Qt4 that provides everything
+# in a single qt4-embedded/qt4-x11 recipe
 QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}"
 QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
+QT_DEPENDS_SVG = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}"
+QT_DEPENDS_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}"
 
 # Run-time dependencies
 QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}"
-- 
1.8.3.2

Re: [PATCH 2/5] qt-provider: expand with extra dependency variables for qtsvg and qtscript

[Maupin, Chase]

Acked-by: Chase Maupin <chase.maupin@ti.com>

>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Monday, October 14, 2013 10:22 PM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 2/5] qt-provider: expand with extra
>dependency variables for qtsvg and qtscript
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> meta-arago-distro/classes/qt-provider.bbclass | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-
>arago-distro/classes/qt-provider.bbclass
>index 444c76a..c0f7184 100644
>--- a/meta-arago-distro/classes/qt-provider.bbclass
>+++ b/meta-arago-distro/classes/qt-provider.bbclass
>@@ -11,9 +11,13 @@ QT_PROVIDER ?= "qt4e"
>
> inherit ${QT_PROVIDER}
>
>-# Build-time dependencies
>+# Build-time dependencies - those are now separate modules in Qt5
>and
>+# require separate dependencies, unlike Qt4 that provides
>everything
>+# in a single qt4-embedded/qt4-x11 recipe
> QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtbase', 'qt4-embedded', d)}"
> QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtwebkit', '', d)}"
>+QT_DEPENDS_SVG = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtsvg', '', d)}"
>+QT_DEPENDS_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtscript', '', d)}"
>
> # Run-time dependencies
> QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtbase-fonts', 'qt4-embedded-fonts', d)}"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Until Graphics SDK gets updated to work with 3.12 kernel.

Note: this effectively disables QtWebKit-based apps like matrix-browser, as
that depends on QtDeclarative and hence QtQuick, which requires GLES.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
index eaf1433..d35a948 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG_GL = "gles2 icu linuxfb"
+PACKAGECONFIG_GL = "icu linuxfb"
 
 SRC_URI += " \
 	file://0001-qeglfswindow.cpp.patch \
-- 
1.8.3.2

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Denys Dmytriyenko]

On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> Until Graphics SDK gets updated to work with 3.12 kernel.
> 
> Note: this effectively disables QtWebKit-based apps like matrix-browser, as
> that depends on QtDeclarative and hence QtQuick, which requires GLES.

BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG in the 
global distro config based on "sgx" machine flag...


> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> index eaf1433..d35a948 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> @@ -1,6 +1,6 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
> +PACKAGECONFIG_GL = "icu linuxfb"
>  
>  SRC_URI += " \
>  	file://0001-qeglfswindow.cpp.patch \
> -- 
> 1.8.3.2
> 

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Maupin, Chase]

>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
>Sent: Monday, October 14, 2013 10:27 PM
>To: meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
>disable eglfs/gles for now
>
>On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@ti.com>
>>
>> Until Graphics SDK gets updated to work with 3.12 kernel.
>>
>> Note: this effectively disables QtWebKit-based apps like matrix-
>browser, as
>> that depends on QtDeclarative and hence QtQuick, which requires
>GLES.

Hold on.  So QtWebKit won't work without GLES?  If so then we still have a problem with Qt5 support by default since not all devices have an SGX right?

>
>BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG
>in the
>global distro config based on "sgx" machine flag...
>
>
>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> ---
>>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-
>qt/qt5/qtbase_5.1.1.bbappend
>> index eaf1433..d35a948 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
>> @@ -1,6 +1,6 @@
>>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>
>> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
>> +PACKAGECONFIG_GL = "icu linuxfb"
>>
>>  SRC_URI += " \
>>  	file://0001-qeglfswindow.cpp.patch \
>> --
>> 1.8.3.2
>>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Maupin, Chase]

>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Maupin, Chase
>Sent: Tuesday, October 15, 2013 10:42 AM
>To: Dmytriyenko, Denys; meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
>disable eglfs/gles for now
>
>
>>-----Original Message-----
>>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
>>Sent: Monday, October 14, 2013 10:27 PM
>>To: meta-arago@arago-project.org
>>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
>>disable eglfs/gles for now
>>
>>On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko
>wrote:
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> Until Graphics SDK gets updated to work with 3.12 kernel.
>>>
>>> Note: this effectively disables QtWebKit-based apps like
>matrix-
>>browser, as
>>> that depends on QtDeclarative and hence QtQuick, which requires
>>GLES.
>
>Hold on.  So QtWebKit won't work without GLES?  If so then we
>still have a problem with Qt5 support by default since not all
>devices have an SGX right?

Or was this dependency always there?

>
>>
>>BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG
>>in the
>>global distro config based on "sgx" machine flag...
>>
>>
>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ---
>>>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta-arago-distro/recipes-
>>qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-
>>qt/qt5/qtbase_5.1.1.bbappend
>>> index eaf1433..d35a948 100644
>>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
>>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
>>> @@ -1,6 +1,6 @@
>>>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>>
>>> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
>>> +PACKAGECONFIG_GL = "icu linuxfb"
>>>
>>>  SRC_URI += " \
>>>  	file://0001-qeglfswindow.cpp.patch \
>>> --
>>> 1.8.3.2
>>>
>>_______________________________________________
>>meta-arago mailing list
>>meta-arago@arago-project.org
>>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Denys Dmytriyenko]

On Tue, Oct 15, 2013 at 11:43:14AM -0400, Maupin, Chase wrote:
> 
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Maupin, Chase
> >Sent: Tuesday, October 15, 2013 10:42 AM
> >To: Dmytriyenko, Denys; meta-arago@arago-project.org
> >Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> >disable eglfs/gles for now
> >
> >
> >>-----Original Message-----
> >>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> >>Sent: Monday, October 14, 2013 10:27 PM
> >>To: meta-arago@arago-project.org
> >>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> >>disable eglfs/gles for now
> >>
> >>On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko
> >wrote:
> >>> From: Denys Dmytriyenko <denys@ti.com>
> >>>
> >>> Until Graphics SDK gets updated to work with 3.12 kernel.
> >>>
> >>> Note: this effectively disables QtWebKit-based apps like
> >matrix-
> >>browser, as
> >>> that depends on QtDeclarative and hence QtQuick, which requires
> >>GLES.
> >
> >Hold on.  So QtWebKit won't work without GLES?  If so then we
> >still have a problem with Qt5 support by default since not all
> >devices have an SGX right?
> 
> Or was this dependency always there?

Right, that's what we've been discussing with Prabu. Only plain QtWidgets can 
work w/o any GL now. QtQuick/QtDeclarative is where GL dependency comes from.

Also, in future versions of Qt5 they are moving away from WebKit to Chromium 
as a web renderer, so it will bring a whole new level of pain...


> >>BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG
> >>in the
> >>global distro config based on "sgx" machine flag...
> >>
> >>
> >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ---
> >>>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/meta-arago-distro/recipes-
> >>qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-
> >>qt/qt5/qtbase_5.1.1.bbappend
> >>> index eaf1433..d35a948 100644
> >>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> >>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> >>> @@ -1,6 +1,6 @@
> >>>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>>
> >>> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
> >>> +PACKAGECONFIG_GL = "icu linuxfb"
> >>>
> >>>  SRC_URI += " \
> >>>  	file://0001-qeglfswindow.cpp.patch \
> >>> --
> >>> 1.8.3.2
> >>>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Cooper Jr., Franklin]

> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Maupin, Chase
> Sent: Tuesday, October 15, 2013 10:43 AM
> To: Maupin, Chase; Dmytriyenko, Denys; meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to disable
> eglfs/gles for now
> 
> 
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Maupin, Chase
> >Sent: Tuesday, October 15, 2013 10:42 AM
> >To: Dmytriyenko, Denys; meta-arago@arago-project.org
> >Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> >disable eglfs/gles for now
> >
> >
> >>-----Original Message-----
> >>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> >>Sent: Monday, October 14, 2013 10:27 PM
> >>To: meta-arago@arago-project.org
> >>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> >>disable eglfs/gles for now
> >>
> >>On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko
> >wrote:
> >>> From: Denys Dmytriyenko <denys@ti.com>
> >>>
> >>> Until Graphics SDK gets updated to work with 3.12 kernel.
> >>>
> >>> Note: this effectively disables QtWebKit-based apps like
> >matrix-
> >>browser, as
> >>> that depends on QtDeclarative and hence QtQuick, which requires
> >>GLES.
> >
> >Hold on.  So QtWebKit won't work without GLES?  If so then we still
> >have a problem with Qt5 support by default since not all devices have
> >an SGX right?
[Franklin] Agreed
> 
> Or was this dependency always there?
[Franklin] No. Good example is AM18x.

I'm curious if there is a option to disable gles support for Webkit 2 or after looking at this link (http://qt-project.org/doc/qt-5.0/qtwebkitexamples/qtwebkitexamples-index.html) if there is an option to use Webkit 1 which shouldn't have this dependency.
> 
> >
> >>
> >>BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG in
> >>the global distro config based on "sgx" machine flag...
> >>
> >>
> >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ---
> >>>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/meta-arago-distro/recipes-
> >>qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-
> >>qt/qt5/qtbase_5.1.1.bbappend
> >>> index eaf1433..d35a948 100644
> >>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> >>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> >>> @@ -1,6 +1,6 @@
> >>>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>>
> >>> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
> >>> +PACKAGECONFIG_GL = "icu linuxfb"
> >>>
> >>>  SRC_URI += " \
> >>>  	file://0001-qeglfswindow.cpp.patch \
> >>> --
> >>> 1.8.3.2
> >>>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/5] qtbase: update bbappend to disable eglfs/gles for now

[Denys Dmytriyenko]

On Tue, Oct 15, 2013 at 11:47:39AM -0400, Cooper Jr., Franklin wrote:
> 
> 
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Maupin, Chase
> > Sent: Tuesday, October 15, 2013 10:43 AM
> > To: Maupin, Chase; Dmytriyenko, Denys; meta-arago@arago-project.org
> > Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to disable
> > eglfs/gles for now
> > 
> > 
> > >-----Original Message-----
> > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >bounces@arago-project.org] On Behalf Of Maupin, Chase
> > >Sent: Tuesday, October 15, 2013 10:42 AM
> > >To: Dmytriyenko, Denys; meta-arago@arago-project.org
> > >Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> > >disable eglfs/gles for now
> > >
> > >
> > >>-----Original Message-----
> > >>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >>bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> > >>Sent: Monday, October 14, 2013 10:27 PM
> > >>To: meta-arago@arago-project.org
> > >>Subject: Re: [meta-arago] [PATCH 3/5] qtbase: update bbappend to
> > >>disable eglfs/gles for now
> > >>
> > >>On Mon, Oct 14, 2013 at 11:21:55PM -0400, Denys Dmytriyenko
> > >wrote:
> > >>> From: Denys Dmytriyenko <denys@ti.com>
> > >>>
> > >>> Until Graphics SDK gets updated to work with 3.12 kernel.
> > >>>
> > >>> Note: this effectively disables QtWebKit-based apps like
> > >matrix-
> > >>browser, as
> > >>> that depends on QtDeclarative and hence QtQuick, which requires
> > >>GLES.
> > >
> > >Hold on.  So QtWebKit won't work without GLES?  If so then we still
> > >have a problem with Qt5 support by default since not all devices have
> > >an SGX right?
> [Franklin] Agreed
> > 
> > Or was this dependency always there?
> [Franklin] No. Good example is AM18x.
> 
> I'm curious if there is a option to disable gles support for Webkit 2 or 
> after looking at this link 
> (http://qt-project.org/doc/qt-5.0/qtwebkitexamples/qtwebkitexamples-index.html) 
> if there is an option to use Webkit 1 which shouldn't have this dependency.

I don't think it can be built separately. QtWebKit handles both WebKit1 and 
WebKit2. But the problem comes not from QtWebKit, but rather from 
QtDeclarative/QtQuick and there's a bug report for that:

https://bugreports.qt-project.org/browse/QTBUG-32587


> > >>BTW, I'll be adding conditional setting of this Qt5 PACKAGECONFIG in
> > >>the global distro config based on "sgx" machine flag...
> > >>
> > >>
> > >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > >>> ---
> > >>>  meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend | 2 +-
> > >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>
> > >>> diff --git a/meta-arago-distro/recipes-
> > >>qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-
> > >>qt/qt5/qtbase_5.1.1.bbappend
> > >>> index eaf1433..d35a948 100644
> > >>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> > >>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
> > >>> @@ -1,6 +1,6 @@
> > >>>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> > >>>
> > >>> -PACKAGECONFIG_GL = "gles2 icu linuxfb"
> > >>> +PACKAGECONFIG_GL = "icu linuxfb"
> > >>>
> > >>>  SRC_URI += " \
> > >>>  	file://0001-qeglfswindow.cpp.patch \
> > >>> --
> > >>> 1.8.3.2
> > >>>
> > >>_______________________________________________
> > >>meta-arago mailing list
> > >>meta-arago@arago-project.org
> > >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > >_______________________________________________
> > >meta-arago mailing list
> > >meta-arago@arago-project.org
> > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 4/5] qt-tstat: update recipe to be Qt4 and Qt5 compatible

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Uses qt-provider class to build against either Qt4 or Qt5 depending on global
distro variable QT_PROVIDER.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 ...ui-with-QtWidgets-per-Qt5-migration-guide.patch | 232 +++++++++++++++++++++
 ...mAscii-toAscii-with-fromLatin1-toLatin1-p.patch |  71 +++++++
 .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  11 +-
 3 files changed, 311 insertions(+), 3 deletions(-)
 create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
 create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch

diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
new file mode 100644
index 0000000..d9bbba9
--- /dev/null
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
@@ -0,0 +1,232 @@
+From 90f70d188b5893fd86aab4f90ac96c9a69ae4e88 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 14 Oct 2013 18:35:30 -0400
+Subject: [PATCH] Replace QtGui with QtWidgets per Qt5 migration guide
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ awayscreen.h          | 2 +-
+ keyboard/keyboard.cpp | 2 +-
+ keyboard/keyboard.h   | 2 +-
+ main.cpp              | 2 +-
+ mainwindow.cpp        | 2 +-
+ mainwindow.h          | 2 +-
+ optionswidget.h       | 2 +-
+ schedulepoint.cpp     | 2 +-
+ schedulepoint.h       | 2 +-
+ schedulescreen.h      | 2 +-
+ settingscreen.cpp     | 2 +-
+ settingscreen.h       | 2 +-
+ thermostatdemo.h      | 2 +-
+ thermostatwidget.h    | 2 +-
+ weatherdatawidget.cpp | 2 +-
+ weatherwidget.h       | 2 +-
+ 16 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/awayscreen.h b/awayscreen.h
+index 2a2b040..b8827b9 100644
+--- a/awayscreen.h
++++ b/awayscreen.h
+@@ -1,7 +1,7 @@
+ #ifndef AWAYSCREEN_H
+ #define AWAYSCREEN_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ class GlobalSettings;
+ 
+diff --git a/keyboard/keyboard.cpp b/keyboard/keyboard.cpp
+index 9261031..0d14530 100644
+--- a/keyboard/keyboard.cpp
++++ b/keyboard/keyboard.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include "keyboard.h"
+ #include "ui_keyboard.h"
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ Keyboard::Keyboard(QWidget *parent) :
+     QWidget(parent),
+diff --git a/keyboard/keyboard.h b/keyboard/keyboard.h
+index 2d5c584..960915c 100644
+--- a/keyboard/keyboard.h
++++ b/keyboard/keyboard.h
+@@ -2,7 +2,7 @@
+ #define KEYBOARD_H
+ 
+ #include <QWidget>
+-#include <QtGui>
++#include <QtWidgets>
+ namespace Ui {
+ class Keyboard;
+ }
+diff --git a/main.cpp b/main.cpp
+index 18234c9..8e0df39 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -1,4 +1,4 @@
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include "mainwindow.h"
+ #include "weatherwidget.h"
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index b3f8994..d8a0a57 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -9,7 +9,7 @@
+ #include "weatherdata.h"
+ #include "utilities.h"
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include <QtDebug>
+ 
+diff --git a/mainwindow.h b/mainwindow.h
+index f59d992..1d46fba 100644
+--- a/mainwindow.h
++++ b/mainwindow.h
+@@ -1,7 +1,7 @@
+ #ifndef MAINWINDOW_H
+ #define MAINWINDOW_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "webdata.h"
+ 
+ 
+diff --git a/optionswidget.h b/optionswidget.h
+index b321280..c797ac2 100644
+--- a/optionswidget.h
++++ b/optionswidget.h
+@@ -1,7 +1,7 @@
+ #ifndef OPTIONSWIDGET_H
+ #define OPTIONSWIDGET_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "awayscreen.h"
+ #include "schedulescreen.h"
+ #include "settingscreen.h"
+diff --git a/schedulepoint.cpp b/schedulepoint.cpp
+index cdaba40..99c7b18 100644
+--- a/schedulepoint.cpp
++++ b/schedulepoint.cpp
+@@ -4,7 +4,7 @@
+ #include "globalsettings.h"
+ #include "utilities.h"
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ 
+ #define MAXTEMP 100
+diff --git a/schedulepoint.h b/schedulepoint.h
+index 1f6d662..38d6acd 100644
+--- a/schedulepoint.h
++++ b/schedulepoint.h
+@@ -1,7 +1,7 @@
+ #ifndef SCHEDULEPOINT_H
+ #define SCHEDULEPOINT_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QApplication>
+ #include <QColor>
+ #include <QGraphicsItem>
+diff --git a/schedulescreen.h b/schedulescreen.h
+index 9bc0897..c424a3f 100644
+--- a/schedulescreen.h
++++ b/schedulescreen.h
+@@ -1,7 +1,7 @@
+ #ifndef SCHEDULESCREEN_H
+ #define SCHEDULESCREEN_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "schedulepoint.h"
+ 
+ class GlobalSettings;
+diff --git a/settingscreen.cpp b/settingscreen.cpp
+index 2f19ae4..62b73b1 100644
+--- a/settingscreen.cpp
++++ b/settingscreen.cpp
+@@ -4,7 +4,7 @@
+ #include "qkeyboardlineedit.h"
+ #include "webdataengine/openweathermapdataengine.h"
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #define MAXIMUM_CONTENT_HEIGHT 450
+ #define MAXIMUM_CONTENT_WIDTH 800
+diff --git a/settingscreen.h b/settingscreen.h
+index 4edf175..172dbe2 100644
+--- a/settingscreen.h
++++ b/settingscreen.h
+@@ -1,7 +1,7 @@
+ #ifndef SETTINGSCREEN_H
+ #define SETTINGSCREEN_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ class GlobalSettings;
+ class QKeyboardLineEdit;
+diff --git a/thermostatdemo.h b/thermostatdemo.h
+index 7223f0a..ca7b27e 100644
+--- a/thermostatdemo.h
++++ b/thermostatdemo.h
+@@ -1,7 +1,7 @@
+ #ifndef THERMOSTATDEMO_H
+ #define THERMOSTATDEMO_H
+ 
+-#include <QtGui/QMainWindow>
++#include <QtWidgets/QMainWindow>
+ 
+ class ThermostatDemo : public QMainWindow
+ {
+diff --git a/thermostatwidget.h b/thermostatwidget.h
+index ba8199b..bbe97ef 100644
+--- a/thermostatwidget.h
++++ b/thermostatwidget.h
+@@ -1,7 +1,7 @@
+ #ifndef THERMOSTATWIDGET_H
+ #define THERMOSTATWIDGET_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ class GlobalSettings;
+ 
+diff --git a/weatherdatawidget.cpp b/weatherdatawidget.cpp
+index 33e8185..20e8fe8 100644
+--- a/weatherdatawidget.cpp
++++ b/weatherdatawidget.cpp
+@@ -1,6 +1,6 @@
+ #include "weatherdatawidget.h"
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "globalsettings.h"
+ #include "weatherdata.h"
+ #include "utilities.h"
+diff --git a/weatherwidget.h b/weatherwidget.h
+index bffb368..40a7916 100644
+--- a/weatherwidget.h
++++ b/weatherwidget.h
+@@ -1,7 +1,7 @@
+ #ifndef WEATHERWIDGET_H
+ #define WEATHERWIDGET_H
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include <QtSvg/QSvgWidget>
+ 
+-- 
+1.8.3.2
+
diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
new file mode 100644
index 0000000..28d2bee
--- /dev/null
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
@@ -0,0 +1,71 @@
+From 3be273cead085ac9cf45bc59236f6d6ef18dc349 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 14 Oct 2013 18:39:27 -0400
+Subject: [PATCH] Replace fromAscii()/toAscii() with fromLatin1()/toLatin1()
+ per Qt5 migration guide
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ remoteaccessmanager.cpp                    | 10 +++++-----
+ webdataengine/openweathermapdataengine.cpp |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
+index 5eebdef..5a6c547 100644
+--- a/remoteaccessmanager.cpp
++++ b/remoteaccessmanager.cpp
+@@ -103,7 +103,7 @@ void RemoteAccessManager::processIncomingConnection()
+         }
+         else if(requestParser[1].contains(".jpg") || requestParser[1].contains(".png"))
+         {
+-            QFile imageFile(":"+QString::fromAscii(requestParser[1]));
++            QFile imageFile(":"+QString::fromLatin1(requestParser[1]));
+ 
+             if(!imageFile.open(QFile::ReadOnly))
+                 ba = "HTTP/1.1 404 NOT FOUND";
+@@ -119,7 +119,7 @@ void RemoteAccessManager::processIncomingConnection()
+         }
+         else if(requestParser[1].contains(".js"))
+         {
+-            QFile jsFile(":"+QString::fromAscii(requestParser[1]));
++            QFile jsFile(":"+QString::fromLatin1(requestParser[1]));
+ 
+             if(!jsFile.open(QFile::ReadOnly))
+                 ba = "HTTP/1.1 404 NOT FOUND";
+@@ -135,7 +135,7 @@ void RemoteAccessManager::processIncomingConnection()
+         }
+         else if(requestParser[1].contains(".css"))
+         {
+-            QFile cssFile(":"+QString::fromAscii(requestParser[1]));
++            QFile cssFile(":"+QString::fromLatin1(requestParser[1]));
+ 
+             if(!cssFile.open(QFile::ReadOnly))
+                 ba = "HTTP/1.1 404 NOT FOUND";
+@@ -213,9 +213,9 @@ QByteArray RemoteAccessManager::hashToJSONByteArray(QHash<QString, QVariant> has
+     {
+         it.next();
+         if(it.value().type() == QVariant::Hash)
+-            jsonByteArray+="\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
++            jsonByteArray+="\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
+         else
+-            jsonByteArray += "\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+"\""+it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
++            jsonByteArray += "\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+"\""+it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
+     }
+ 
+     jsonByteArray = jsonByteArray.left(jsonByteArray.size()-1);
+diff --git a/webdataengine/openweathermapdataengine.cpp b/webdataengine/openweathermapdataengine.cpp
+index 0286dd5..de39f48 100644
+--- a/webdataengine/openweathermapdataengine.cpp
++++ b/webdataengine/openweathermapdataengine.cpp
+@@ -67,7 +67,7 @@ void OpenWeatherMapDataEngine::responseReceived()
+         QByteArray data = m_reply->readAll();
+         //qDebug() << data;
+ 
+-        m_cityId = parseCityInformation(QString::fromAscii(data));
++        m_cityId = parseCityInformation(QString::fromLatin1(data));
+         //docs say do not delete in the slot so well pass it off to the event loop
+         m_reply->deleteLater();
+         if(m_cityId == -1)
+-- 
+1.8.3.2
+
diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
index 198ef1f..8035537 100644
--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
@@ -10,7 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
 
 require recipes-core/matrix/matrix-gui-paths.inc
 
-PR = "r4"
+inherit qt-provider
+
+PR = "r5"
+
+DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
 
 BRANCH ?= "master"
 SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
@@ -20,9 +24,10 @@ SRC_URI = " \
 	file://0001-Update-Makefile.build-for-when-build-dir-is-not-the-.patch \
 "
 
-S = "${WORKDIR}/git/"
+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \
+	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch', '', d)}"
 
-inherit qt4e
+S = "${WORKDIR}/git/"
 
 # use the make targets already created in the Makefile.build files
 do_install() {
-- 
1.8.3.2

Re: [PATCH 4/5] qt-tstat: update recipe to be Qt4 and Qt5 compatible

[Maupin, Chase]

Acked-by: Chase Maupin <chase.maupin@ti.com>


>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Monday, October 14, 2013 10:22 PM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 4/5] qt-tstat: update recipe to be
>Qt4 and Qt5 compatible
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Uses qt-provider class to build against either Qt4 or Qt5
>depending on global
>distro variable QT_PROVIDER.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> ...ui-with-QtWidgets-per-Qt5-migration-guide.patch | 232
>+++++++++++++++++++++
> ...mAscii-toAscii-with-fromLatin1-toLatin1-p.patch |  71 +++++++
> .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  11 +-
> 3 files changed, 311 insertions(+), 3 deletions(-)
> create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
>guide.patch
> create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-
>p.patch
>
>diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-
>Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch b/meta-
>arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-
>QtWidgets-per-Qt5-migration-guide.patch
>new file mode 100644
>index 0000000..d9bbba9
>--- /dev/null
>+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-
>QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
>@@ -0,0 +1,232 @@
>+From 90f70d188b5893fd86aab4f90ac96c9a69ae4e88 Mon Sep 17 00:00:00
>2001
>+From: Denys Dmytriyenko <denys@ti.com>
>+Date: Mon, 14 Oct 2013 18:35:30 -0400
>+Subject: [PATCH] Replace QtGui with QtWidgets per Qt5 migration
>guide
>+
>+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>+---
>+ awayscreen.h          | 2 +-
>+ keyboard/keyboard.cpp | 2 +-
>+ keyboard/keyboard.h   | 2 +-
>+ main.cpp              | 2 +-
>+ mainwindow.cpp        | 2 +-
>+ mainwindow.h          | 2 +-
>+ optionswidget.h       | 2 +-
>+ schedulepoint.cpp     | 2 +-
>+ schedulepoint.h       | 2 +-
>+ schedulescreen.h      | 2 +-
>+ settingscreen.cpp     | 2 +-
>+ settingscreen.h       | 2 +-
>+ thermostatdemo.h      | 2 +-
>+ thermostatwidget.h    | 2 +-
>+ weatherdatawidget.cpp | 2 +-
>+ weatherwidget.h       | 2 +-
>+ 16 files changed, 16 insertions(+), 16 deletions(-)
>+
>+diff --git a/awayscreen.h b/awayscreen.h
>+index 2a2b040..b8827b9 100644
>+--- a/awayscreen.h
>++++ b/awayscreen.h
>+@@ -1,7 +1,7 @@
>+ #ifndef AWAYSCREEN_H
>+ #define AWAYSCREEN_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ class GlobalSettings;
>+
>+diff --git a/keyboard/keyboard.cpp b/keyboard/keyboard.cpp
>+index 9261031..0d14530 100644
>+--- a/keyboard/keyboard.cpp
>++++ b/keyboard/keyboard.cpp
>+@@ -37,7 +37,7 @@
>+
>+ #include "keyboard.h"
>+ #include "ui_keyboard.h"
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ Keyboard::Keyboard(QWidget *parent) :
>+     QWidget(parent),
>+diff --git a/keyboard/keyboard.h b/keyboard/keyboard.h
>+index 2d5c584..960915c 100644
>+--- a/keyboard/keyboard.h
>++++ b/keyboard/keyboard.h
>+@@ -2,7 +2,7 @@
>+ #define KEYBOARD_H
>+
>+ #include <QWidget>
>+-#include <QtGui>
>++#include <QtWidgets>
>+ namespace Ui {
>+ class Keyboard;
>+ }
>+diff --git a/main.cpp b/main.cpp
>+index 18234c9..8e0df39 100644
>+--- a/main.cpp
>++++ b/main.cpp
>+@@ -1,4 +1,4 @@
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ #include "mainwindow.h"
>+ #include "weatherwidget.h"
>+diff --git a/mainwindow.cpp b/mainwindow.cpp
>+index b3f8994..d8a0a57 100644
>+--- a/mainwindow.cpp
>++++ b/mainwindow.cpp
>+@@ -9,7 +9,7 @@
>+ #include "weatherdata.h"
>+ #include "utilities.h"
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ #include <QtDebug>
>+
>+diff --git a/mainwindow.h b/mainwindow.h
>+index f59d992..1d46fba 100644
>+--- a/mainwindow.h
>++++ b/mainwindow.h
>+@@ -1,7 +1,7 @@
>+ #ifndef MAINWINDOW_H
>+ #define MAINWINDOW_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include "webdata.h"
>+
>+
>+diff --git a/optionswidget.h b/optionswidget.h
>+index b321280..c797ac2 100644
>+--- a/optionswidget.h
>++++ b/optionswidget.h
>+@@ -1,7 +1,7 @@
>+ #ifndef OPTIONSWIDGET_H
>+ #define OPTIONSWIDGET_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include "awayscreen.h"
>+ #include "schedulescreen.h"
>+ #include "settingscreen.h"
>+diff --git a/schedulepoint.cpp b/schedulepoint.cpp
>+index cdaba40..99c7b18 100644
>+--- a/schedulepoint.cpp
>++++ b/schedulepoint.cpp
>+@@ -4,7 +4,7 @@
>+ #include "globalsettings.h"
>+ #include "utilities.h"
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+
>+ #define MAXTEMP 100
>+diff --git a/schedulepoint.h b/schedulepoint.h
>+index 1f6d662..38d6acd 100644
>+--- a/schedulepoint.h
>++++ b/schedulepoint.h
>+@@ -1,7 +1,7 @@
>+ #ifndef SCHEDULEPOINT_H
>+ #define SCHEDULEPOINT_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include <QApplication>
>+ #include <QColor>
>+ #include <QGraphicsItem>
>+diff --git a/schedulescreen.h b/schedulescreen.h
>+index 9bc0897..c424a3f 100644
>+--- a/schedulescreen.h
>++++ b/schedulescreen.h
>+@@ -1,7 +1,7 @@
>+ #ifndef SCHEDULESCREEN_H
>+ #define SCHEDULESCREEN_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include "schedulepoint.h"
>+
>+ class GlobalSettings;
>+diff --git a/settingscreen.cpp b/settingscreen.cpp
>+index 2f19ae4..62b73b1 100644
>+--- a/settingscreen.cpp
>++++ b/settingscreen.cpp
>+@@ -4,7 +4,7 @@
>+ #include "qkeyboardlineedit.h"
>+ #include "webdataengine/openweathermapdataengine.h"
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ #define MAXIMUM_CONTENT_HEIGHT 450
>+ #define MAXIMUM_CONTENT_WIDTH 800
>+diff --git a/settingscreen.h b/settingscreen.h
>+index 4edf175..172dbe2 100644
>+--- a/settingscreen.h
>++++ b/settingscreen.h
>+@@ -1,7 +1,7 @@
>+ #ifndef SETTINGSCREEN_H
>+ #define SETTINGSCREEN_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ class GlobalSettings;
>+ class QKeyboardLineEdit;
>+diff --git a/thermostatdemo.h b/thermostatdemo.h
>+index 7223f0a..ca7b27e 100644
>+--- a/thermostatdemo.h
>++++ b/thermostatdemo.h
>+@@ -1,7 +1,7 @@
>+ #ifndef THERMOSTATDEMO_H
>+ #define THERMOSTATDEMO_H
>+
>+-#include <QtGui/QMainWindow>
>++#include <QtWidgets/QMainWindow>
>+
>+ class ThermostatDemo : public QMainWindow
>+ {
>+diff --git a/thermostatwidget.h b/thermostatwidget.h
>+index ba8199b..bbe97ef 100644
>+--- a/thermostatwidget.h
>++++ b/thermostatwidget.h
>+@@ -1,7 +1,7 @@
>+ #ifndef THERMOSTATWIDGET_H
>+ #define THERMOSTATWIDGET_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ class GlobalSettings;
>+
>+diff --git a/weatherdatawidget.cpp b/weatherdatawidget.cpp
>+index 33e8185..20e8fe8 100644
>+--- a/weatherdatawidget.cpp
>++++ b/weatherdatawidget.cpp
>+@@ -1,6 +1,6 @@
>+ #include "weatherdatawidget.h"
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include "globalsettings.h"
>+ #include "weatherdata.h"
>+ #include "utilities.h"
>+diff --git a/weatherwidget.h b/weatherwidget.h
>+index bffb368..40a7916 100644
>+--- a/weatherwidget.h
>++++ b/weatherwidget.h
>+@@ -1,7 +1,7 @@
>+ #ifndef WEATHERWIDGET_H
>+ #define WEATHERWIDGET_H
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+
>+ #include <QtSvg/QSvgWidget>
>+
>+--
>+1.8.3.2
>+
>diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-
>Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch b/meta-
>arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-
>toAscii-with-fromLatin1-toLatin1-p.patch
>new file mode 100644
>index 0000000..28d2bee
>--- /dev/null
>+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-
>fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
>@@ -0,0 +1,71 @@
>+From 3be273cead085ac9cf45bc59236f6d6ef18dc349 Mon Sep 17 00:00:00
>2001
>+From: Denys Dmytriyenko <denys@ti.com>
>+Date: Mon, 14 Oct 2013 18:39:27 -0400
>+Subject: [PATCH] Replace fromAscii()/toAscii() with
>fromLatin1()/toLatin1()
>+ per Qt5 migration guide
>+
>+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>+---
>+ remoteaccessmanager.cpp                    | 10 +++++-----
>+ webdataengine/openweathermapdataengine.cpp |  2 +-
>+ 2 files changed, 6 insertions(+), 6 deletions(-)
>+
>+diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
>+index 5eebdef..5a6c547 100644
>+--- a/remoteaccessmanager.cpp
>++++ b/remoteaccessmanager.cpp
>+@@ -103,7 +103,7 @@ void
>RemoteAccessManager::processIncomingConnection()
>+         }
>+         else if(requestParser[1].contains(".jpg") ||
>requestParser[1].contains(".png"))
>+         {
>+-            QFile
>imageFile(":"+QString::fromAscii(requestParser[1]));
>++            QFile
>imageFile(":"+QString::fromLatin1(requestParser[1]));
>+
>+             if(!imageFile.open(QFile::ReadOnly))
>+                 ba = "HTTP/1.1 404 NOT FOUND";
>+@@ -119,7 +119,7 @@ void
>RemoteAccessManager::processIncomingConnection()
>+         }
>+         else if(requestParser[1].contains(".js"))
>+         {
>+-            QFile
>jsFile(":"+QString::fromAscii(requestParser[1]));
>++            QFile
>jsFile(":"+QString::fromLatin1(requestParser[1]));
>+
>+             if(!jsFile.open(QFile::ReadOnly))
>+                 ba = "HTTP/1.1 404 NOT FOUND";
>+@@ -135,7 +135,7 @@ void
>RemoteAccessManager::processIncomingConnection()
>+         }
>+         else if(requestParser[1].contains(".css"))
>+         {
>+-            QFile
>cssFile(":"+QString::fromAscii(requestParser[1]));
>++            QFile
>cssFile(":"+QString::fromLatin1(requestParser[1]));
>+
>+             if(!cssFile.open(QFile::ReadOnly))
>+                 ba = "HTTP/1.1 404 NOT FOUND";
>+@@ -213,9 +213,9 @@ QByteArray
>RemoteAccessManager::hashToJSONByteArray(QHash<QString, QVariant>
>has
>+     {
>+         it.next();
>+         if(it.value().type() == QVariant::Hash)
>+-
>jsonByteArray+="\""+it.key().toAscii()+"\""+QByteArray::fromRawDat
>a(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
>++
>jsonByteArray+="\""+it.key().toLatin1()+"\""+QByteArray::fromRawDa
>ta(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
>+         else
>+-            jsonByteArray +=
>"\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+"\""+i
>t.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
>++            jsonByteArray +=
>"\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+"\""+
>it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
>+     }
>+
>+     jsonByteArray = jsonByteArray.left(jsonByteArray.size()-1);
>+diff --git a/webdataengine/openweathermapdataengine.cpp
>b/webdataengine/openweathermapdataengine.cpp
>+index 0286dd5..de39f48 100644
>+--- a/webdataengine/openweathermapdataengine.cpp
>++++ b/webdataengine/openweathermapdataengine.cpp
>+@@ -67,7 +67,7 @@ void
>OpenWeatherMapDataEngine::responseReceived()
>+         QByteArray data = m_reply->readAll();
>+         //qDebug() << data;
>+
>+-        m_cityId =
>parseCityInformation(QString::fromAscii(data));
>++        m_cityId =
>parseCityInformation(QString::fromLatin1(data));
>+         //docs say do not delete in the slot so well pass it off
>to the event loop
>+         m_reply->deleteLater();
>+         if(m_cityId == -1)
>+--
>+1.8.3.2
>+
>diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>index 198ef1f..8035537 100644
>--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>@@ -10,7 +10,11 @@ LIC_FILES_CHKSUM =
>"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
>
> require recipes-core/matrix/matrix-gui-paths.inc
>
>-PR = "r4"
>+inherit qt-provider
>+
>+PR = "r5"
>+
>+DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>
> BRANCH ?= "master"
> SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
>@@ -20,9 +24,10 @@ SRC_URI = " \
> 	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
>the-.patch \
> "
>
>-S = "${WORKDIR}/git/"
>+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5',
>'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
>guide.patch \
>+	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-
>toLatin1-p.patch', '', d)}"
>
>-inherit qt4e
>+S = "${WORKDIR}/git/"
>
> # use the make targets already created in the Makefile.build
>files
> do_install() {
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 4/5] qt-tstat: update recipe to be Qt4 and Qt5 compatible

[Denys Dmytriyenko]

So, should I push these patches in? They don't change the fact that Qt4 is 
still the default setting...


On Tue, Oct 15, 2013 at 03:47:32PM +0000, Maupin, Chase wrote:
> Acked-by: Chase Maupin <chase.maupin@ti.com>
> 
> 
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> >Sent: Monday, October 14, 2013 10:22 PM
> >To: meta-arago@arago-project.org
> >Subject: [meta-arago] [PATCH 4/5] qt-tstat: update recipe to be
> >Qt4 and Qt5 compatible
> >
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Uses qt-provider class to build against either Qt4 or Qt5
> >depending on global
> >distro variable QT_PROVIDER.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> > ...ui-with-QtWidgets-per-Qt5-migration-guide.patch | 232
> >+++++++++++++++++++++
> > ...mAscii-toAscii-with-fromLatin1-toLatin1-p.patch |  71 +++++++
> > .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  11 +-
> > 3 files changed, 311 insertions(+), 3 deletions(-)
> > create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
> >tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
> >guide.patch
> > create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
> >tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-
> >p.patch
> >
> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-
> >Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch b/meta-
> >arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-with-
> >QtWidgets-per-Qt5-migration-guide.patch
> >new file mode 100644
> >index 0000000..d9bbba9
> >--- /dev/null
> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-
> >QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
> >@@ -0,0 +1,232 @@
> >+From 90f70d188b5893fd86aab4f90ac96c9a69ae4e88 Mon Sep 17 00:00:00
> >2001
> >+From: Denys Dmytriyenko <denys@ti.com>
> >+Date: Mon, 14 Oct 2013 18:35:30 -0400
> >+Subject: [PATCH] Replace QtGui with QtWidgets per Qt5 migration
> >guide
> >+
> >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >+---
> >+ awayscreen.h          | 2 +-
> >+ keyboard/keyboard.cpp | 2 +-
> >+ keyboard/keyboard.h   | 2 +-
> >+ main.cpp              | 2 +-
> >+ mainwindow.cpp        | 2 +-
> >+ mainwindow.h          | 2 +-
> >+ optionswidget.h       | 2 +-
> >+ schedulepoint.cpp     | 2 +-
> >+ schedulepoint.h       | 2 +-
> >+ schedulescreen.h      | 2 +-
> >+ settingscreen.cpp     | 2 +-
> >+ settingscreen.h       | 2 +-
> >+ thermostatdemo.h      | 2 +-
> >+ thermostatwidget.h    | 2 +-
> >+ weatherdatawidget.cpp | 2 +-
> >+ weatherwidget.h       | 2 +-
> >+ 16 files changed, 16 insertions(+), 16 deletions(-)
> >+
> >+diff --git a/awayscreen.h b/awayscreen.h
> >+index 2a2b040..b8827b9 100644
> >+--- a/awayscreen.h
> >++++ b/awayscreen.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef AWAYSCREEN_H
> >+ #define AWAYSCREEN_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ class GlobalSettings;
> >+
> >+diff --git a/keyboard/keyboard.cpp b/keyboard/keyboard.cpp
> >+index 9261031..0d14530 100644
> >+--- a/keyboard/keyboard.cpp
> >++++ b/keyboard/keyboard.cpp
> >+@@ -37,7 +37,7 @@
> >+
> >+ #include "keyboard.h"
> >+ #include "ui_keyboard.h"
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ Keyboard::Keyboard(QWidget *parent) :
> >+     QWidget(parent),
> >+diff --git a/keyboard/keyboard.h b/keyboard/keyboard.h
> >+index 2d5c584..960915c 100644
> >+--- a/keyboard/keyboard.h
> >++++ b/keyboard/keyboard.h
> >+@@ -2,7 +2,7 @@
> >+ #define KEYBOARD_H
> >+
> >+ #include <QWidget>
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ namespace Ui {
> >+ class Keyboard;
> >+ }
> >+diff --git a/main.cpp b/main.cpp
> >+index 18234c9..8e0df39 100644
> >+--- a/main.cpp
> >++++ b/main.cpp
> >+@@ -1,4 +1,4 @@
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ #include "mainwindow.h"
> >+ #include "weatherwidget.h"
> >+diff --git a/mainwindow.cpp b/mainwindow.cpp
> >+index b3f8994..d8a0a57 100644
> >+--- a/mainwindow.cpp
> >++++ b/mainwindow.cpp
> >+@@ -9,7 +9,7 @@
> >+ #include "weatherdata.h"
> >+ #include "utilities.h"
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ #include <QtDebug>
> >+
> >+diff --git a/mainwindow.h b/mainwindow.h
> >+index f59d992..1d46fba 100644
> >+--- a/mainwindow.h
> >++++ b/mainwindow.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef MAINWINDOW_H
> >+ #define MAINWINDOW_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ #include "webdata.h"
> >+
> >+
> >+diff --git a/optionswidget.h b/optionswidget.h
> >+index b321280..c797ac2 100644
> >+--- a/optionswidget.h
> >++++ b/optionswidget.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef OPTIONSWIDGET_H
> >+ #define OPTIONSWIDGET_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ #include "awayscreen.h"
> >+ #include "schedulescreen.h"
> >+ #include "settingscreen.h"
> >+diff --git a/schedulepoint.cpp b/schedulepoint.cpp
> >+index cdaba40..99c7b18 100644
> >+--- a/schedulepoint.cpp
> >++++ b/schedulepoint.cpp
> >+@@ -4,7 +4,7 @@
> >+ #include "globalsettings.h"
> >+ #include "utilities.h"
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+
> >+ #define MAXTEMP 100
> >+diff --git a/schedulepoint.h b/schedulepoint.h
> >+index 1f6d662..38d6acd 100644
> >+--- a/schedulepoint.h
> >++++ b/schedulepoint.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef SCHEDULEPOINT_H
> >+ #define SCHEDULEPOINT_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ #include <QApplication>
> >+ #include <QColor>
> >+ #include <QGraphicsItem>
> >+diff --git a/schedulescreen.h b/schedulescreen.h
> >+index 9bc0897..c424a3f 100644
> >+--- a/schedulescreen.h
> >++++ b/schedulescreen.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef SCHEDULESCREEN_H
> >+ #define SCHEDULESCREEN_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ #include "schedulepoint.h"
> >+
> >+ class GlobalSettings;
> >+diff --git a/settingscreen.cpp b/settingscreen.cpp
> >+index 2f19ae4..62b73b1 100644
> >+--- a/settingscreen.cpp
> >++++ b/settingscreen.cpp
> >+@@ -4,7 +4,7 @@
> >+ #include "qkeyboardlineedit.h"
> >+ #include "webdataengine/openweathermapdataengine.h"
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ #define MAXIMUM_CONTENT_HEIGHT 450
> >+ #define MAXIMUM_CONTENT_WIDTH 800
> >+diff --git a/settingscreen.h b/settingscreen.h
> >+index 4edf175..172dbe2 100644
> >+--- a/settingscreen.h
> >++++ b/settingscreen.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef SETTINGSCREEN_H
> >+ #define SETTINGSCREEN_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ class GlobalSettings;
> >+ class QKeyboardLineEdit;
> >+diff --git a/thermostatdemo.h b/thermostatdemo.h
> >+index 7223f0a..ca7b27e 100644
> >+--- a/thermostatdemo.h
> >++++ b/thermostatdemo.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef THERMOSTATDEMO_H
> >+ #define THERMOSTATDEMO_H
> >+
> >+-#include <QtGui/QMainWindow>
> >++#include <QtWidgets/QMainWindow>
> >+
> >+ class ThermostatDemo : public QMainWindow
> >+ {
> >+diff --git a/thermostatwidget.h b/thermostatwidget.h
> >+index ba8199b..bbe97ef 100644
> >+--- a/thermostatwidget.h
> >++++ b/thermostatwidget.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef THERMOSTATWIDGET_H
> >+ #define THERMOSTATWIDGET_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ class GlobalSettings;
> >+
> >+diff --git a/weatherdatawidget.cpp b/weatherdatawidget.cpp
> >+index 33e8185..20e8fe8 100644
> >+--- a/weatherdatawidget.cpp
> >++++ b/weatherdatawidget.cpp
> >+@@ -1,6 +1,6 @@
> >+ #include "weatherdatawidget.h"
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+ #include "globalsettings.h"
> >+ #include "weatherdata.h"
> >+ #include "utilities.h"
> >+diff --git a/weatherwidget.h b/weatherwidget.h
> >+index bffb368..40a7916 100644
> >+--- a/weatherwidget.h
> >++++ b/weatherwidget.h
> >+@@ -1,7 +1,7 @@
> >+ #ifndef WEATHERWIDGET_H
> >+ #define WEATHERWIDGET_H
> >+
> >+-#include <QtGui>
> >++#include <QtWidgets>
> >+
> >+ #include <QtSvg/QSvgWidget>
> >+
> >+--
> >+1.8.3.2
> >+
> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-
> >Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch b/meta-
> >arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-fromAscii-
> >toAscii-with-fromLatin1-toLatin1-p.patch
> >new file mode 100644
> >index 0000000..28d2bee
> >--- /dev/null
> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-
> >fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
> >@@ -0,0 +1,71 @@
> >+From 3be273cead085ac9cf45bc59236f6d6ef18dc349 Mon Sep 17 00:00:00
> >2001
> >+From: Denys Dmytriyenko <denys@ti.com>
> >+Date: Mon, 14 Oct 2013 18:39:27 -0400
> >+Subject: [PATCH] Replace fromAscii()/toAscii() with
> >fromLatin1()/toLatin1()
> >+ per Qt5 migration guide
> >+
> >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >+---
> >+ remoteaccessmanager.cpp                    | 10 +++++-----
> >+ webdataengine/openweathermapdataengine.cpp |  2 +-
> >+ 2 files changed, 6 insertions(+), 6 deletions(-)
> >+
> >+diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
> >+index 5eebdef..5a6c547 100644
> >+--- a/remoteaccessmanager.cpp
> >++++ b/remoteaccessmanager.cpp
> >+@@ -103,7 +103,7 @@ void
> >RemoteAccessManager::processIncomingConnection()
> >+         }
> >+         else if(requestParser[1].contains(".jpg") ||
> >requestParser[1].contains(".png"))
> >+         {
> >+-            QFile
> >imageFile(":"+QString::fromAscii(requestParser[1]));
> >++            QFile
> >imageFile(":"+QString::fromLatin1(requestParser[1]));
> >+
> >+             if(!imageFile.open(QFile::ReadOnly))
> >+                 ba = "HTTP/1.1 404 NOT FOUND";
> >+@@ -119,7 +119,7 @@ void
> >RemoteAccessManager::processIncomingConnection()
> >+         }
> >+         else if(requestParser[1].contains(".js"))
> >+         {
> >+-            QFile
> >jsFile(":"+QString::fromAscii(requestParser[1]));
> >++            QFile
> >jsFile(":"+QString::fromLatin1(requestParser[1]));
> >+
> >+             if(!jsFile.open(QFile::ReadOnly))
> >+                 ba = "HTTP/1.1 404 NOT FOUND";
> >+@@ -135,7 +135,7 @@ void
> >RemoteAccessManager::processIncomingConnection()
> >+         }
> >+         else if(requestParser[1].contains(".css"))
> >+         {
> >+-            QFile
> >cssFile(":"+QString::fromAscii(requestParser[1]));
> >++            QFile
> >cssFile(":"+QString::fromLatin1(requestParser[1]));
> >+
> >+             if(!cssFile.open(QFile::ReadOnly))
> >+                 ba = "HTTP/1.1 404 NOT FOUND";
> >+@@ -213,9 +213,9 @@ QByteArray
> >RemoteAccessManager::hashToJSONByteArray(QHash<QString, QVariant>
> >has
> >+     {
> >+         it.next();
> >+         if(it.value().type() == QVariant::Hash)
> >+-
> >jsonByteArray+="\""+it.key().toAscii()+"\""+QByteArray::fromRawDat
> >a(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
> >++
> >jsonByteArray+="\""+it.key().toLatin1()+"\""+QByteArray::fromRawDa
> >ta(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
> >+         else
> >+-            jsonByteArray +=
> >"\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+"\""+i
> >t.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
> >++            jsonByteArray +=
> >"\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+"\""+
> >it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
> >+     }
> >+
> >+     jsonByteArray = jsonByteArray.left(jsonByteArray.size()-1);
> >+diff --git a/webdataengine/openweathermapdataengine.cpp
> >b/webdataengine/openweathermapdataengine.cpp
> >+index 0286dd5..de39f48 100644
> >+--- a/webdataengine/openweathermapdataengine.cpp
> >++++ b/webdataengine/openweathermapdataengine.cpp
> >+@@ -67,7 +67,7 @@ void
> >OpenWeatherMapDataEngine::responseReceived()
> >+         QByteArray data = m_reply->readAll();
> >+         //qDebug() << data;
> >+
> >+-        m_cityId =
> >parseCityInformation(QString::fromAscii(data));
> >++        m_cityId =
> >parseCityInformation(QString::fromLatin1(data));
> >+         //docs say do not delete in the slot so well pass it off
> >to the event loop
> >+         m_reply->deleteLater();
> >+         if(m_cityId == -1)
> >+--
> >+1.8.3.2
> >+
> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >index 198ef1f..8035537 100644
> >--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >@@ -10,7 +10,11 @@ LIC_FILES_CHKSUM =
> >"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
> >
> > require recipes-core/matrix/matrix-gui-paths.inc
> >
> >-PR = "r4"
> >+inherit qt-provider
> >+
> >+PR = "r5"
> >+
> >+DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
> >
> > BRANCH ?= "master"
> > SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
> >@@ -20,9 +24,10 @@ SRC_URI = " \
> > 	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
> >the-.patch \
> > "
> >
> >-S = "${WORKDIR}/git/"
> >+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5',
> >'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
> >guide.patch \
> >+	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-
> >toLatin1-p.patch', '', d)}"
> >
> >-inherit qt4e
> >+S = "${WORKDIR}/git/"
> >
> > # use the make targets already created in the Makefile.build
> >files
> > do_install() {
> >--
> >1.8.3.2
> >
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 4/5] qt-tstat: update recipe to be Qt4 and Qt5 compatible

[Maupin, Chase]

Seems fine


>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Tuesday, October 15, 2013 1:57 PM
>To: Maupin, Chase
>Cc: meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 4/5] qt-tstat: update recipe to
>be Qt4 and Qt5 compatible
>
>So, should I push these patches in? They don't change the fact
>that Qt4 is
>still the default setting...
>
>
>On Tue, Oct 15, 2013 at 03:47:32PM +0000, Maupin, Chase wrote:
>> Acked-by: Chase Maupin <chase.maupin@ti.com>
>>
>>
>> >-----Original Message-----
>> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>> >Sent: Monday, October 14, 2013 10:22 PM
>> >To: meta-arago@arago-project.org
>> >Subject: [meta-arago] [PATCH 4/5] qt-tstat: update recipe to be
>> >Qt4 and Qt5 compatible
>> >
>> >From: Denys Dmytriyenko <denys@ti.com>
>> >
>> >Uses qt-provider class to build against either Qt4 or Qt5
>> >depending on global
>> >distro variable QT_PROVIDER.
>> >
>> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> >---
>> > ...ui-with-QtWidgets-per-Qt5-migration-guide.patch | 232
>> >+++++++++++++++++++++
>> > ...mAscii-toAscii-with-fromLatin1-toLatin1-p.patch |  71
>+++++++
>> > .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  11 +-
>> > 3 files changed, 311 insertions(+), 3 deletions(-)
>> > create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
>> >tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
>> >guide.patch
>> > create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
>> >tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-
>> >p.patch
>> >
>> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat/0002-
>> >Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
>b/meta-
>> >arago-extras/recipes-qt/qt-apps/qt-tstat/0002-Replace-QtGui-
>with-
>> >QtWidgets-per-Qt5-migration-guide.patch
>> >new file mode 100644
>> >index 0000000..d9bbba9
>> >--- /dev/null
>> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0002-
>Replace-
>> >QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
>> >@@ -0,0 +1,232 @@
>> >+From 90f70d188b5893fd86aab4f90ac96c9a69ae4e88 Mon Sep 17
>00:00:00
>> >2001
>> >+From: Denys Dmytriyenko <denys@ti.com>
>> >+Date: Mon, 14 Oct 2013 18:35:30 -0400
>> >+Subject: [PATCH] Replace QtGui with QtWidgets per Qt5
>migration
>> >guide
>> >+
>> >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> >+---
>> >+ awayscreen.h          | 2 +-
>> >+ keyboard/keyboard.cpp | 2 +-
>> >+ keyboard/keyboard.h   | 2 +-
>> >+ main.cpp              | 2 +-
>> >+ mainwindow.cpp        | 2 +-
>> >+ mainwindow.h          | 2 +-
>> >+ optionswidget.h       | 2 +-
>> >+ schedulepoint.cpp     | 2 +-
>> >+ schedulepoint.h       | 2 +-
>> >+ schedulescreen.h      | 2 +-
>> >+ settingscreen.cpp     | 2 +-
>> >+ settingscreen.h       | 2 +-
>> >+ thermostatdemo.h      | 2 +-
>> >+ thermostatwidget.h    | 2 +-
>> >+ weatherdatawidget.cpp | 2 +-
>> >+ weatherwidget.h       | 2 +-
>> >+ 16 files changed, 16 insertions(+), 16 deletions(-)
>> >+
>> >+diff --git a/awayscreen.h b/awayscreen.h
>> >+index 2a2b040..b8827b9 100644
>> >+--- a/awayscreen.h
>> >++++ b/awayscreen.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef AWAYSCREEN_H
>> >+ #define AWAYSCREEN_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ class GlobalSettings;
>> >+
>> >+diff --git a/keyboard/keyboard.cpp b/keyboard/keyboard.cpp
>> >+index 9261031..0d14530 100644
>> >+--- a/keyboard/keyboard.cpp
>> >++++ b/keyboard/keyboard.cpp
>> >+@@ -37,7 +37,7 @@
>> >+
>> >+ #include "keyboard.h"
>> >+ #include "ui_keyboard.h"
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ Keyboard::Keyboard(QWidget *parent) :
>> >+     QWidget(parent),
>> >+diff --git a/keyboard/keyboard.h b/keyboard/keyboard.h
>> >+index 2d5c584..960915c 100644
>> >+--- a/keyboard/keyboard.h
>> >++++ b/keyboard/keyboard.h
>> >+@@ -2,7 +2,7 @@
>> >+ #define KEYBOARD_H
>> >+
>> >+ #include <QWidget>
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ namespace Ui {
>> >+ class Keyboard;
>> >+ }
>> >+diff --git a/main.cpp b/main.cpp
>> >+index 18234c9..8e0df39 100644
>> >+--- a/main.cpp
>> >++++ b/main.cpp
>> >+@@ -1,4 +1,4 @@
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ #include "mainwindow.h"
>> >+ #include "weatherwidget.h"
>> >+diff --git a/mainwindow.cpp b/mainwindow.cpp
>> >+index b3f8994..d8a0a57 100644
>> >+--- a/mainwindow.cpp
>> >++++ b/mainwindow.cpp
>> >+@@ -9,7 +9,7 @@
>> >+ #include "weatherdata.h"
>> >+ #include "utilities.h"
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ #include <QtDebug>
>> >+
>> >+diff --git a/mainwindow.h b/mainwindow.h
>> >+index f59d992..1d46fba 100644
>> >+--- a/mainwindow.h
>> >++++ b/mainwindow.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef MAINWINDOW_H
>> >+ #define MAINWINDOW_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ #include "webdata.h"
>> >+
>> >+
>> >+diff --git a/optionswidget.h b/optionswidget.h
>> >+index b321280..c797ac2 100644
>> >+--- a/optionswidget.h
>> >++++ b/optionswidget.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef OPTIONSWIDGET_H
>> >+ #define OPTIONSWIDGET_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ #include "awayscreen.h"
>> >+ #include "schedulescreen.h"
>> >+ #include "settingscreen.h"
>> >+diff --git a/schedulepoint.cpp b/schedulepoint.cpp
>> >+index cdaba40..99c7b18 100644
>> >+--- a/schedulepoint.cpp
>> >++++ b/schedulepoint.cpp
>> >+@@ -4,7 +4,7 @@
>> >+ #include "globalsettings.h"
>> >+ #include "utilities.h"
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+
>> >+ #define MAXTEMP 100
>> >+diff --git a/schedulepoint.h b/schedulepoint.h
>> >+index 1f6d662..38d6acd 100644
>> >+--- a/schedulepoint.h
>> >++++ b/schedulepoint.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef SCHEDULEPOINT_H
>> >+ #define SCHEDULEPOINT_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ #include <QApplication>
>> >+ #include <QColor>
>> >+ #include <QGraphicsItem>
>> >+diff --git a/schedulescreen.h b/schedulescreen.h
>> >+index 9bc0897..c424a3f 100644
>> >+--- a/schedulescreen.h
>> >++++ b/schedulescreen.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef SCHEDULESCREEN_H
>> >+ #define SCHEDULESCREEN_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ #include "schedulepoint.h"
>> >+
>> >+ class GlobalSettings;
>> >+diff --git a/settingscreen.cpp b/settingscreen.cpp
>> >+index 2f19ae4..62b73b1 100644
>> >+--- a/settingscreen.cpp
>> >++++ b/settingscreen.cpp
>> >+@@ -4,7 +4,7 @@
>> >+ #include "qkeyboardlineedit.h"
>> >+ #include "webdataengine/openweathermapdataengine.h"
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ #define MAXIMUM_CONTENT_HEIGHT 450
>> >+ #define MAXIMUM_CONTENT_WIDTH 800
>> >+diff --git a/settingscreen.h b/settingscreen.h
>> >+index 4edf175..172dbe2 100644
>> >+--- a/settingscreen.h
>> >++++ b/settingscreen.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef SETTINGSCREEN_H
>> >+ #define SETTINGSCREEN_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ class GlobalSettings;
>> >+ class QKeyboardLineEdit;
>> >+diff --git a/thermostatdemo.h b/thermostatdemo.h
>> >+index 7223f0a..ca7b27e 100644
>> >+--- a/thermostatdemo.h
>> >++++ b/thermostatdemo.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef THERMOSTATDEMO_H
>> >+ #define THERMOSTATDEMO_H
>> >+
>> >+-#include <QtGui/QMainWindow>
>> >++#include <QtWidgets/QMainWindow>
>> >+
>> >+ class ThermostatDemo : public QMainWindow
>> >+ {
>> >+diff --git a/thermostatwidget.h b/thermostatwidget.h
>> >+index ba8199b..bbe97ef 100644
>> >+--- a/thermostatwidget.h
>> >++++ b/thermostatwidget.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef THERMOSTATWIDGET_H
>> >+ #define THERMOSTATWIDGET_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ class GlobalSettings;
>> >+
>> >+diff --git a/weatherdatawidget.cpp b/weatherdatawidget.cpp
>> >+index 33e8185..20e8fe8 100644
>> >+--- a/weatherdatawidget.cpp
>> >++++ b/weatherdatawidget.cpp
>> >+@@ -1,6 +1,6 @@
>> >+ #include "weatherdatawidget.h"
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+ #include "globalsettings.h"
>> >+ #include "weatherdata.h"
>> >+ #include "utilities.h"
>> >+diff --git a/weatherwidget.h b/weatherwidget.h
>> >+index bffb368..40a7916 100644
>> >+--- a/weatherwidget.h
>> >++++ b/weatherwidget.h
>> >+@@ -1,7 +1,7 @@
>> >+ #ifndef WEATHERWIDGET_H
>> >+ #define WEATHERWIDGET_H
>> >+
>> >+-#include <QtGui>
>> >++#include <QtWidgets>
>> >+
>> >+ #include <QtSvg/QSvgWidget>
>> >+
>> >+--
>> >+1.8.3.2
>> >+
>> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat/0003-
>> >Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
>b/meta-
>> >arago-extras/recipes-qt/qt-apps/qt-tstat/0003-Replace-
>fromAscii-
>> >toAscii-with-fromLatin1-toLatin1-p.patch
>> >new file mode 100644
>> >index 0000000..28d2bee
>> >--- /dev/null
>> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0003-
>Replace-
>> >fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
>> >@@ -0,0 +1,71 @@
>> >+From 3be273cead085ac9cf45bc59236f6d6ef18dc349 Mon Sep 17
>00:00:00
>> >2001
>> >+From: Denys Dmytriyenko <denys@ti.com>
>> >+Date: Mon, 14 Oct 2013 18:39:27 -0400
>> >+Subject: [PATCH] Replace fromAscii()/toAscii() with
>> >fromLatin1()/toLatin1()
>> >+ per Qt5 migration guide
>> >+
>> >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> >+---
>> >+ remoteaccessmanager.cpp                    | 10 +++++-----
>> >+ webdataengine/openweathermapdataengine.cpp |  2 +-
>> >+ 2 files changed, 6 insertions(+), 6 deletions(-)
>> >+
>> >+diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
>> >+index 5eebdef..5a6c547 100644
>> >+--- a/remoteaccessmanager.cpp
>> >++++ b/remoteaccessmanager.cpp
>> >+@@ -103,7 +103,7 @@ void
>> >RemoteAccessManager::processIncomingConnection()
>> >+         }
>> >+         else if(requestParser[1].contains(".jpg") ||
>> >requestParser[1].contains(".png"))
>> >+         {
>> >+-            QFile
>> >imageFile(":"+QString::fromAscii(requestParser[1]));
>> >++            QFile
>> >imageFile(":"+QString::fromLatin1(requestParser[1]));
>> >+
>> >+             if(!imageFile.open(QFile::ReadOnly))
>> >+                 ba = "HTTP/1.1 404 NOT FOUND";
>> >+@@ -119,7 +119,7 @@ void
>> >RemoteAccessManager::processIncomingConnection()
>> >+         }
>> >+         else if(requestParser[1].contains(".js"))
>> >+         {
>> >+-            QFile
>> >jsFile(":"+QString::fromAscii(requestParser[1]));
>> >++            QFile
>> >jsFile(":"+QString::fromLatin1(requestParser[1]));
>> >+
>> >+             if(!jsFile.open(QFile::ReadOnly))
>> >+                 ba = "HTTP/1.1 404 NOT FOUND";
>> >+@@ -135,7 +135,7 @@ void
>> >RemoteAccessManager::processIncomingConnection()
>> >+         }
>> >+         else if(requestParser[1].contains(".css"))
>> >+         {
>> >+-            QFile
>> >cssFile(":"+QString::fromAscii(requestParser[1]));
>> >++            QFile
>> >cssFile(":"+QString::fromLatin1(requestParser[1]));
>> >+
>> >+             if(!cssFile.open(QFile::ReadOnly))
>> >+                 ba = "HTTP/1.1 404 NOT FOUND";
>> >+@@ -213,9 +213,9 @@ QByteArray
>> >RemoteAccessManager::hashToJSONByteArray(QHash<QString,
>QVariant>
>> >has
>> >+     {
>> >+         it.next();
>> >+         if(it.value().type() == QVariant::Hash)
>> >+-
>>
>>jsonByteArray+="\""+it.key().toAscii()+"\""+QByteArray::fromRawDa
>t
>> >a(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
>> >++
>>
>>jsonByteArray+="\""+it.key().toLatin1()+"\""+QByteArray::fromRawD
>a
>> >ta(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
>> >+         else
>> >+-            jsonByteArray +=
>>
>>"\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+"\""+
>i
>> >t.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
>> >++            jsonByteArray +=
>>
>>"\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+"\""
>+
>> >it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
>> >+     }
>> >+
>> >+     jsonByteArray = jsonByteArray.left(jsonByteArray.size()-
>1);
>> >+diff --git a/webdataengine/openweathermapdataengine.cpp
>> >b/webdataengine/openweathermapdataengine.cpp
>> >+index 0286dd5..de39f48 100644
>> >+--- a/webdataengine/openweathermapdataengine.cpp
>> >++++ b/webdataengine/openweathermapdataengine.cpp
>> >+@@ -67,7 +67,7 @@ void
>> >OpenWeatherMapDataEngine::responseReceived()
>> >+         QByteArray data = m_reply->readAll();
>> >+         //qDebug() << data;
>> >+
>> >+-        m_cityId =
>> >parseCityInformation(QString::fromAscii(data));
>> >++        m_cityId =
>> >parseCityInformation(QString::fromLatin1(data));
>> >+         //docs say do not delete in the slot so well pass it
>off
>> >to the event loop
>> >+         m_reply->deleteLater();
>> >+         if(m_cityId == -1)
>> >+--
>> >+1.8.3.2
>> >+
>> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat_2.0.bb
>> >b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>> >index 198ef1f..8035537 100644
>> >--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>> >@@ -10,7 +10,11 @@ LIC_FILES_CHKSUM =
>> >"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
>> >
>> > require recipes-core/matrix/matrix-gui-paths.inc
>> >
>> >-PR = "r4"
>> >+inherit qt-provider
>> >+
>> >+PR = "r5"
>> >+
>> >+DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>> >
>> > BRANCH ?= "master"
>> > SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
>> >@@ -20,9 +24,10 @@ SRC_URI = " \
>> > 	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
>> >the-.patch \
>> > "
>> >
>> >-S = "${WORKDIR}/git/"
>> >+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5',
>> >'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-
>> >guide.patch \
>> >+	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-
>> >toLatin1-p.patch', '', d)}"
>> >
>> >-inherit qt4e
>> >+S = "${WORKDIR}/git/"
>> >
>> > # use the make targets already created in the Makefile.build
>> >files
>> > do_install() {
>> >--
>> >1.8.3.2
>> >
>> >_______________________________________________
>> >meta-arago mailing list
>> >meta-arago@arago-project.org
>> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 5/5] arago-qt5-test-image: replace matrix-browser with qt-tstat demo

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

* As matrix-browser requires QtWebKit, which depends on QtDeclarative, that
  depends on QtQuick, which requires GLES to build and function.
* Instead, use QtWidgets based Thermostat demo app to showcase Qt 5.1.1 on
  framebuffer when GLES is not available.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
index cd5c054..5fbbfd3 100644
--- a/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
@@ -8,9 +8,12 @@ IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
     packagegroup-arago-base-tisdk \
-    matrix-gui-browser \
-    qtwebkit-examples-examples \
     qtbase-plugins \
+    qt-tstat \
     "
 
+# These are now disabled due to gles dependency
+#    matrix-gui-browser
+#    qtwebkit-examples-examples
+
 export IMAGE_BASENAME = "arago-qt5-test-image"
-- 
1.8.3.2

Re: [PATCH 1/5] qt-tstat: fix Makefile to support build outside of source, i.e. ${S} != ${B}

[Maupin, Chase]

>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Monday, October 14, 2013 10:22 PM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 1/5] qt-tstat: fix Makefile to
>support build outside of source, i.e. ${S} != ${B}
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> ...file.build-for-when-build-dir-is-not-the-.patch | 35
>++++++++++++++++++++++
> .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  9 ++++--
> 2 files changed, 41 insertions(+), 3 deletions(-)
> create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
>tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-
>.patch
>
>diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-
>Update-Makefile.build-for-when-build-dir-is-not-the-.patch b/meta-
>arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
>Makefile.build-for-when-build-dir-is-not-the-.patch
>new file mode 100644
>index 0000000..3ceb74a
>--- /dev/null
>+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
>Makefile.build-for-when-build-dir-is-not-the-.patch

Can we push this patch to the upstream project?  I think we own this one right?

>@@ -0,0 +1,35 @@
>+From 00666002c48ebbb21e73eb9fbe90615cef87cc11 Mon Sep 17 00:00:00
>2001
>+From: Denys Dmytriyenko <denys@ti.com>
>+Date: Mon, 14 Oct 2013 18:53:28 -0400
>+Subject: [PATCH] Update Makefile.build for when build dir is not
>the same as
>+ source dir
>+
>+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>+---
>+ Makefile.build | 3 ++-
>+ 1 file changed, 2 insertions(+), 1 deletion(-)
>+
>+diff --git a/Makefile.build b/Makefile.build
>+index 18892d4..72b8e34 100644
>+--- a/Makefile.build
>++++ b/Makefile.build
>+@@ -2,6 +2,7 @@
>+
>+ ENV_SETUP ?= ../../linux-devkit/environment-setup
>+ DESTDIR ?=
>++BUILDDIR ?= .
>+ PLATFORM ?=
>+ MATRIX_APP_DIR ?= /usr/share/matrix-gui-2.0/apps/
>+ PLATFORM_DEFINE ?= "Platform_${PLATFORM}"
>+@@ -28,7 +29,7 @@ clean : ${SOURCES} qmake
>+
>+ install_common:
>+ 	@install -d ${DESTDIR}/usr/bin
>+-	@install -m 0755 ThermostatDemo
>${DESTDIR}/usr/bin/ThermostatDemo
>++	@install -m 0755 ${BUILDDIR}/ThermostatDemo
>${DESTDIR}/usr/bin/ThermostatDemo
>+ 	@install -d ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
>+ 	@cp -rf matrix-files/*  ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
>+
>+--
>+1.8.3.2
>+
>diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>index 19c29fb..198ef1f 100644
>--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
>@@ -10,12 +10,15 @@ LIC_FILES_CHKSUM =
>"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
>
> require recipes-core/matrix/matrix-gui-paths.inc
>
>-PR = "r3"
>+PR = "r4"
>
> BRANCH ?= "master"
> SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
>
>-SRC_URI = "git://gitorious.org/thermostat-demo/thermostat-
>demo.git;protocol=git"
>+SRC_URI = " \
>+	git://gitorious.org/thermostat-demo/thermostat-
>demo.git;protocol=git \
>+	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
>the-.patch \
>+"
>
> S = "${WORKDIR}/git/"
>
>@@ -23,7 +26,7 @@ inherit qt4e
>
> # use the make targets already created in the Makefile.build
>files
> do_install() {
>-	make -f Makefile.build DESTDIR=${D} install_common
>+	cd ${S} && make -f Makefile.build DESTDIR=${D} BUILDDIR=${B}
>install_common
> }
>
> PACKAGES += "matrix-gui-thermostat-demo"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 1/5] qt-tstat: fix Makefile to support build outside of source, i.e. ${S} != ${B}

[Denys Dmytriyenko]

On Tue, Oct 15, 2013 at 03:45:36PM +0000, Maupin, Chase wrote:
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> >Sent: Monday, October 14, 2013 10:22 PM
> >To: meta-arago@arago-project.org
> >Subject: [meta-arago] [PATCH 1/5] qt-tstat: fix Makefile to
> >support build outside of source, i.e. ${S} != ${B}
> >
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> > ...file.build-for-when-build-dir-is-not-the-.patch | 35
> >++++++++++++++++++++++
> > .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  9 ++++--
> > 2 files changed, 41 insertions(+), 3 deletions(-)
> > create mode 100644 meta-arago-extras/recipes-qt/qt-apps/qt-
> >tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-
> >.patch
> >
> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-
> >Update-Makefile.build-for-when-build-dir-is-not-the-.patch b/meta-
> >arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
> >Makefile.build-for-when-build-dir-is-not-the-.patch
> >new file mode 100644
> >index 0000000..3ceb74a
> >--- /dev/null
> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
> >Makefile.build-for-when-build-dir-is-not-the-.patch
> 
> Can we push this patch to the upstream project?  I think we own this one 
> right?

Right, I separated this out from other Qt5 changes on purpose. We should 
definitely push it to upstream qt-tstat project. Franklin, any objections?


> >@@ -0,0 +1,35 @@
> >+From 00666002c48ebbb21e73eb9fbe90615cef87cc11 Mon Sep 17 00:00:00
> >2001
> >+From: Denys Dmytriyenko <denys@ti.com>
> >+Date: Mon, 14 Oct 2013 18:53:28 -0400
> >+Subject: [PATCH] Update Makefile.build for when build dir is not
> >the same as
> >+ source dir
> >+
> >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >+---
> >+ Makefile.build | 3 ++-
> >+ 1 file changed, 2 insertions(+), 1 deletion(-)
> >+
> >+diff --git a/Makefile.build b/Makefile.build
> >+index 18892d4..72b8e34 100644
> >+--- a/Makefile.build
> >++++ b/Makefile.build
> >+@@ -2,6 +2,7 @@
> >+
> >+ ENV_SETUP ?= ../../linux-devkit/environment-setup
> >+ DESTDIR ?=
> >++BUILDDIR ?= .
> >+ PLATFORM ?=
> >+ MATRIX_APP_DIR ?= /usr/share/matrix-gui-2.0/apps/
> >+ PLATFORM_DEFINE ?= "Platform_${PLATFORM}"
> >+@@ -28,7 +29,7 @@ clean : ${SOURCES} qmake
> >+
> >+ install_common:
> >+ 	@install -d ${DESTDIR}/usr/bin
> >+-	@install -m 0755 ThermostatDemo
> >${DESTDIR}/usr/bin/ThermostatDemo
> >++	@install -m 0755 ${BUILDDIR}/ThermostatDemo
> >${DESTDIR}/usr/bin/ThermostatDemo
> >+ 	@install -d ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
> >+ 	@cp -rf matrix-files/*  ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
> >+
> >+--
> >+1.8.3.2
> >+
> >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >index 19c29fb..198ef1f 100644
> >--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> >@@ -10,12 +10,15 @@ LIC_FILES_CHKSUM =
> >"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
> >
> > require recipes-core/matrix/matrix-gui-paths.inc
> >
> >-PR = "r3"
> >+PR = "r4"
> >
> > BRANCH ?= "master"
> > SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
> >
> >-SRC_URI = "git://gitorious.org/thermostat-demo/thermostat-
> >demo.git;protocol=git"
> >+SRC_URI = " \
> >+	git://gitorious.org/thermostat-demo/thermostat-
> >demo.git;protocol=git \
> >+	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
> >the-.patch \
> >+"
> >
> > S = "${WORKDIR}/git/"
> >
> >@@ -23,7 +26,7 @@ inherit qt4e
> >
> > # use the make targets already created in the Makefile.build
> >files
> > do_install() {
> >-	make -f Makefile.build DESTDIR=${D} install_common
> >+	cd ${S} && make -f Makefile.build DESTDIR=${D} BUILDDIR=${B}
> >install_common
> > }
> >
> > PACKAGES += "matrix-gui-thermostat-demo"
> >--
> >1.8.3.2
> >
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 1/5] qt-tstat: fix Makefile to support build outside of source, i.e. ${S} != ${B}

[Cooper Jr., Franklin]

No issue. If you need me to push it please send it to me as an attachment.

> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> Sent: Tuesday, October 15, 2013 10:48 AM
> To: Maupin, Chase
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 1/5] qt-tstat: fix Makefile to support build
> outside of source, i.e. ${S} != ${B}
> 
> On Tue, Oct 15, 2013 at 03:45:36PM +0000, Maupin, Chase wrote:
> > >-----Original Message-----
> > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > >Sent: Monday, October 14, 2013 10:22 PM
> > >To: meta-arago@arago-project.org
> > >Subject: [meta-arago] [PATCH 1/5] qt-tstat: fix Makefile to support
> > >build outside of source, i.e. ${S} != ${B}
> > >
> > >From: Denys Dmytriyenko <denys@ti.com>
> > >
> > >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > >---
> > > ...file.build-for-when-build-dir-is-not-the-.patch | 35
> > >++++++++++++++++++++++
> > > .../recipes-qt/qt-apps/qt-tstat_2.0.bb             |  9 ++++--
> > > 2 files changed, 41 insertions(+), 3 deletions(-)  create mode
> > >100644 meta-arago-extras/recipes-qt/qt-apps/qt-
> > >tstat/0001-Update-Makefile.build-for-when-build-dir-is-not-the-
> > >.patch
> > >
> > >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-
> > >Update-Makefile.build-for-when-build-dir-is-not-the-.patch b/meta-
> > >arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
> > >Makefile.build-for-when-build-dir-is-not-the-.patch
> > >new file mode 100644
> > >index 0000000..3ceb74a
> > >--- /dev/null
> > >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat/0001-Update-
> > >Makefile.build-for-when-build-dir-is-not-the-.patch
> >
> > Can we push this patch to the upstream project?  I think we own this
> > one right?
> 
> Right, I separated this out from other Qt5 changes on purpose. We should
> definitely push it to upstream qt-tstat project. Franklin, any objections?
> 
> 
> > >@@ -0,0 +1,35 @@
> > >+From 00666002c48ebbb21e73eb9fbe90615cef87cc11 Mon Sep 17
> 00:00:00
> > >2001
> > >+From: Denys Dmytriyenko <denys@ti.com>
> > >+Date: Mon, 14 Oct 2013 18:53:28 -0400
> > >+Subject: [PATCH] Update Makefile.build for when build dir is not
> > >the same as
> > >+ source dir
> > >+
> > >+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > >+---
> > >+ Makefile.build | 3 ++-
> > >+ 1 file changed, 2 insertions(+), 1 deletion(-)
> > >+
> > >+diff --git a/Makefile.build b/Makefile.build
> > >+index 18892d4..72b8e34 100644
> > >+--- a/Makefile.build
> > >++++ b/Makefile.build
> > >+@@ -2,6 +2,7 @@
> > >+
> > >+ ENV_SETUP ?= ../../linux-devkit/environment-setup
> > >+ DESTDIR ?=
> > >++BUILDDIR ?= .
> > >+ PLATFORM ?=
> > >+ MATRIX_APP_DIR ?= /usr/share/matrix-gui-2.0/apps/
> > >+ PLATFORM_DEFINE ?= "Platform_${PLATFORM}"
> > >+@@ -28,7 +29,7 @@ clean : ${SOURCES} qmake
> > >+
> > >+ install_common:
> > >+ 	@install -d ${DESTDIR}/usr/bin
> > >+-	@install -m 0755 ThermostatDemo
> > >${DESTDIR}/usr/bin/ThermostatDemo
> > >++	@install -m 0755 ${BUILDDIR}/ThermostatDemo
> > >${DESTDIR}/usr/bin/ThermostatDemo
> > >+ 	@install -d ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
> > >+ 	@cp -rf matrix-files/*  ${DESTDIR}${MATRIX_APP_DIR}/qt_tstat
> > >+
> > >+--
> > >+1.8.3.2
> > >+
> > >diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> > >b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> > >index 19c29fb..198ef1f 100644
> > >--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> > >+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
> > >@@ -10,12 +10,15 @@ LIC_FILES_CHKSUM =
> > >"file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
> > >
> > > require recipes-core/matrix/matrix-gui-paths.inc
> > >
> > >-PR = "r3"
> > >+PR = "r4"
> > >
> > > BRANCH ?= "master"
> > > SRCREV = "27e033a0ac59928cc3acbb45f4d9bc2101fcf024"
> > >
> > >-SRC_URI = "git://gitorious.org/thermostat-demo/thermostat-
> > >demo.git;protocol=git"
> > >+SRC_URI = " \
> > >+	git://gitorious.org/thermostat-demo/thermostat-
> > >demo.git;protocol=git \
> > >+	file://0001-Update-Makefile.build-for-when-build-dir-is-not-
> > >the-.patch \
> > >+"
> > >
> > > S = "${WORKDIR}/git/"
> > >
> > >@@ -23,7 +26,7 @@ inherit qt4e
> > >
> > > # use the make targets already created in the Makefile.build
> > >files
> > > do_install() {
> > >-	make -f Makefile.build DESTDIR=${D} install_common
> > >+	cd ${S} && make -f Makefile.build DESTDIR=${D} BUILDDIR=${B}
> > >install_common
> > > }
> > >
> > > PACKAGES += "matrix-gui-thermostat-demo"
> > >--
> > >1.8.3.2
> > >
> > >_______________________________________________
> > >meta-arago mailing list
> > >meta-arago@arago-project.org
> > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago