* [PATCH 0/5] qt5-related fixes
@ 2014-06-03 2:29 Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change Denys Dmytriyenko
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
This patchset is a re-submit of the Qt5-related portion of the earlier series
that was discussed couple weeks ago and used in the Weston-based demo. The rest
of patches will follow shortly, after some cleanup.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
@ 2014-06-03 2:29 ` Denys Dmytriyenko
2014-06-03 14:33 ` Cooper Jr., Franklin
2014-06-03 2:29 ` [PATCH 2/5] refresh-screen: convert to Qt5 Denys Dmytriyenko
` (3 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Last change broke Qt5 install, which uses B!=S unlike Qt4.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--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 d0a9f7a..1b15f2f 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
@@ -12,7 +12,7 @@ require recipes-core/matrix/matrix-gui-paths.inc
inherit qt-provider
-PR = "r7"
+PR = "r8"
DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
@@ -28,13 +28,11 @@ SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://0002-Replace-QtGui
S = "${WORKDIR}/git/"
-BUILDDIR ?= "."
-
do_install() {
install -d ${D}/usr/bin
- install -m 0755 ${BUILDDIR}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
+ install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
install -d ${D}${MATRIX_APP_DIR}/qt_tstat
- cp -rf matrix-files/* ${D}${MATRIX_APP_DIR}/qt_tstat
+ cp -rf ${S}/matrix-files/* ${D}${MATRIX_APP_DIR}/qt_tstat
}
PACKAGES += "matrix-gui-thermostat-demo"
--
1.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/5] refresh-screen: convert to Qt5
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change Denys Dmytriyenko
@ 2014-06-03 2:29 ` Denys Dmytriyenko
2014-06-03 14:39 ` Cooper Jr., Franklin
2014-06-03 2:29 ` [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5 Denys Dmytriyenko
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Use qt-provider to build it against Qt4 or Qt5
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...een.pro-add-widgets-module-to-the-project.patch | 26 ++++++++++++++++++++++
| 26 ++++++++++++++++++++++
.../recipes-core/matrix/refresh-screen_2.0.bb | 17 +++++++++-----
3 files changed, 64 insertions(+), 5 deletions(-)
create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
new file mode 100644
index 0000000..b9a1f80
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
@@ -0,0 +1,26 @@
+From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 12 May 2014 21:07:32 -0400
+Subject: [PATCH] refresh-screen.pro: add widgets module to the project for Qt5
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ refresh_screen.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/refresh_screen.pro b/refresh_screen.pro
+index afe5c25..a79abd0 100644
+--- a/refresh_screen.pro
++++ b/refresh_screen.pro
+@@ -4,7 +4,7 @@
+ #
+ #-------------------------------------------------
+
+-QT += core gui
++QT += core gui widgets
+
+ TARGET = refresh_screen
+ TEMPLATE = app
+--
+1.9.2
+
--git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
new file mode 100644
index 0000000..66c002d
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
@@ -0,0 +1,26 @@
+From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 12 May 2014 21:01:57 -0400
+Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.cpp b/main.cpp
+index c5744d8..5a61904 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -36,7 +36,7 @@
+ *
+ */
+
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include "mainwindow.h"
+
+ int main(int argc, char *argv[])
+--
+1.9.2
+
diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
index 2696978..fc41f32 100644
--- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
@@ -4,21 +4,28 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b5276496"
SECTION = "multimedia"
+inherit qt-provider
+
# Make sure that QT font libraries have been installed
-RDEPENDS_${PN} += "qt4-embedded-fonts"
+RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
-PR = "r4"
+PR = "r5"
SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3"
BRANCH ?= "master"
SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh-screen.git;protocol=git;branch=${BRANCH}"
-S = "${WORKDIR}/git"
+QT5_DIFF = " \
+file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch \
+file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \
+"
-inherit qt4e
+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '', d)}"
+
+S = "${WORKDIR}/git"
do_install() {
install -d ${D}/${bindir}
- install -m 0755 ${S}/refresh_screen ${D}/${bindir}
+ install -m 0755 ${B}/refresh_screen ${D}/${bindir}
}
--
1.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 2/5] refresh-screen: convert to Qt5 Denys Dmytriyenko
@ 2014-06-03 2:29 ` Denys Dmytriyenko
2014-06-03 14:48 ` Cooper Jr., Franklin
2014-06-03 2:29 ` [PATCH 4/5] packagegroup-*-qt5: add Qt5 versions of arago packagegroups Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5 Denys Dmytriyenko
4 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
As ARAGO_QT_PROVIDER is used to select between gles and non-gles versions of Qt4,
make it aware of Qt5 and set it empty in that case.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 6ae11e9..0885acf 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -25,7 +25,7 @@ PREFERRED_VERSION_libdrm = "2.4.46"
PREFERRED_PROVIDER_virtual/gettext = "gettext"
-ARAGO_QT_PROVIDER = "${@base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d)}"
+ARAGO_QT_PROVIDER = "${@base_contains('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d),d)}"
PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
PREFERRED_VERSION_qt4-embedded = "4.8.5"
--
1.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/5] packagegroup-*-qt5: add Qt5 versions of arago packagegroups
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
` (2 preceding siblings ...)
2014-06-03 2:29 ` [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5 Denys Dmytriyenko
@ 2014-06-03 2:29 ` Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5 Denys Dmytriyenko
4 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../packagegroups/packagegroup-arago-qt5.bb | 15 +++++++++++++++
.../packagegroups/packagegroup-arago-tisdk-qt5.bb | 18 ++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
new file mode 100644
index 0000000..ff0f3ed
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Task to add Qt embedded related packages"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = "\
+ qtbase-plugins \
+ qtdeclarative-plugins \
+ qtlocation-plugins \
+ qtmultimedia-plugins \
+ qtwayland-plugins \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
new file mode 100644
index 0000000..9ce43e6
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Task to add Qt embedded related packages"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+QT_DEMOS = "\
+ qtwayland-examples \
+ qtwebkit-examples-examples \
+ qt-tstat \
+"
+
+RDEPENDS_${PN} = "\
+ packagegroup-arago-qt5 \
+ ${QT_DEMOS} \
+"
--
1.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
` (3 preceding siblings ...)
2014-06-03 2:29 ` [PATCH 4/5] packagegroup-*-qt5: add Qt5 versions of arago packagegroups Denys Dmytriyenko
@ 2014-06-03 2:29 ` Denys Dmytriyenko
2014-06-03 14:40 ` Cooper Jr., Franklin
4 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 2:29 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 1bc6a36..0d7810a 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
IMAGE_INSTALL += "\
packagegroup-arago-test \
${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
- packagegroup-arago-tisdk-qte \
+ ${@base_contains('QT_PROVIDER','qt5','packagegroup-arago-tisdk-qt5','packagegroup-arago-tisdk-qte',d)} \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
--
1.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change
2014-06-03 2:29 ` [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change Denys Dmytriyenko
@ 2014-06-03 14:33 ` Cooper Jr., Franklin
0 siblings, 0 replies; 14+ messages in thread
From: Cooper Jr., Franklin @ 2014-06-03 14:33 UTC (permalink / raw
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@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, June 02, 2014 9:30 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 1/5] qt-tstat: fix install with Qt5, broken by
> latest change
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Last change broke Qt5 install, which uses B!=S unlike Qt4.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> 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 d0a9f7a..1b15f2f 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
> @@ -12,7 +12,7 @@ require recipes-core/matrix/matrix-gui-paths.inc
>
> inherit qt-provider
>
> -PR = "r7"
> +PR = "r8"
>
> DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>
> @@ -28,13 +28,11 @@ SRC_URI += "${@base_conditional('QT_PROVIDER',
> 'qt5', 'file://0002-Replace-QtGui
>
> S = "${WORKDIR}/git/"
>
> -BUILDDIR ?= "."
> -
> do_install() {
> install -d ${D}/usr/bin
> - install -m 0755 ${BUILDDIR}/ThermostatDemo
> ${D}/usr/bin/ThermostatDemo
> + install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
> install -d ${D}${MATRIX_APP_DIR}/qt_tstat
> - cp -rf matrix-files/* ${D}${MATRIX_APP_DIR}/qt_tstat
> + cp -rf ${S}/matrix-files/* ${D}${MATRIX_APP_DIR}/qt_tstat
> }
>
> PACKAGES += "matrix-gui-thermostat-demo"
> --
> 1.9.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/5] refresh-screen: convert to Qt5
2014-06-03 2:29 ` [PATCH 2/5] refresh-screen: convert to Qt5 Denys Dmytriyenko
@ 2014-06-03 14:39 ` Cooper Jr., Franklin
2014-06-03 14:47 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Cooper Jr., Franklin @ 2014-06-03 14:39 UTC (permalink / raw
To: Denys Dmytriyenko, meta-arago@arago-project.org
It would be nice if we can drop the Qt 5 specific patches and simply allow the "clean" sources to work for both Qt 4 and Qt 5.
http://www.kdab.com/automated-porting-from-qt-4-to-qt-5/
http://stackoverflow.com/questions/18663331/how-to-check-the-selected-version-of-qt-in-a-pro-file
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> Sent: Monday, June 02, 2014 9:30 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 2/5] refresh-screen: convert to Qt5
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Use qt-provider to build it against Qt4 or Qt5
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> ...een.pro-add-widgets-module-to-the-project.patch | 26
> ++++++++++++++++++++++ ...place-QtGui-header-with-QtWidgets-for-
> Qt5.patch | 26 ++++++++++++++++++++++
> .../recipes-core/matrix/refresh-screen_2.0.bb | 17 +++++++++-----
> 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 meta-
> arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> widgets-module-to-the-project.patch
> create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-
> screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
>
> diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-
> refresh-screen.pro-add-widgets-module-to-the-project.patch b/meta-arago-
> extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> widgets-module-to-the-project.patch
> new file mode 100644
> index 0000000..b9a1f80
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-
> +++ screen.pro-add-widgets-module-to-the-project.patch
> @@ -0,0 +1,26 @@
> +From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17 00:00:00
> 2001
> +From: Denys Dmytriyenko <denys@ti.com>
> +Date: Mon, 12 May 2014 21:07:32 -0400
> +Subject: [PATCH] refresh-screen.pro: add widgets module to the project
> +for Qt5
> +
> +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> +---
> + refresh_screen.pro | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/refresh_screen.pro b/refresh_screen.pro index
> +afe5c25..a79abd0 100644
> +--- a/refresh_screen.pro
> ++++ b/refresh_screen.pro
> +@@ -4,7 +4,7 @@
> + #
> + #-------------------------------------------------
> +
> +-QT += core gui
> ++QT += core gui widgets
> +
> + TARGET = refresh_screen
> + TEMPLATE = app
> +--
> +1.9.2
> +
> diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-
> Replace-QtGui-header-with-QtWidgets-for-Qt5.patch b/meta-arago-
> extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-
> QtWidgets-for-Qt5.patch
> new file mode 100644
> index 0000000..66c002d
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-
> +++ QtGui-header-with-QtWidgets-for-Qt5.patch
> @@ -0,0 +1,26 @@
> +From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17 00:00:00
> 2001
> +From: Denys Dmytriyenko <denys@ti.com>
> +Date: Mon, 12 May 2014 21:01:57 -0400
> +Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5
> +
> +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> +---
> + main.cpp | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/main.cpp b/main.cpp
> +index c5744d8..5a61904 100644
> +--- a/main.cpp
> ++++ b/main.cpp
> +@@ -36,7 +36,7 @@
> + *
> + */
> +
> +-#include <QtGui/QApplication>
> ++#include <QtWidgets/QApplication>
> + #include "mainwindow.h"
> +
> + int main(int argc, char *argv[])
> +--
> +1.9.2
> +
> diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> index 2696978..fc41f32 100644
> --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> @@ -4,21 +4,28 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM =
> "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b527
> 6496"
> SECTION = "multimedia"
>
> +inherit qt-provider
> +
> # Make sure that QT font libraries have been installed -RDEPENDS_${PN} +=
> "qt4-embedded-fonts"
> +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
>
> -PR = "r4"
> +PR = "r5"
>
> SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3"
> BRANCH ?= "master"
>
> SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh-
> screen.git;protocol=git;branch=${BRANCH}"
>
> -S = "${WORKDIR}/git"
> +QT5_DIFF = " \
> +file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
> +\ file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \ "
>
> -inherit qt4e
> +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '',
> d)}"
> +
> +S = "${WORKDIR}/git"
>
> do_install() {
> install -d ${D}/${bindir}
> - install -m 0755 ${S}/refresh_screen ${D}/${bindir}
> + install -m 0755 ${B}/refresh_screen ${D}/${bindir}
> }
> --
> 1.9.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5
2014-06-03 2:29 ` [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5 Denys Dmytriyenko
@ 2014-06-03 14:40 ` Cooper Jr., Franklin
0 siblings, 0 replies; 14+ messages in thread
From: Cooper Jr., Franklin @ 2014-06-03 14:40 UTC (permalink / raw
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@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, June 02, 2014 9:30 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 5/5] tisdk-rootfs-image: use correct
> packagegroup for Qt4/Qt5
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> index 1bc6a36..0d7810a 100644
> --- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> +++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> @@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb IMAGE_INSTALL += "\
> packagegroup-arago-test \
> ${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-
> graphics','',d)} \
> - packagegroup-arago-tisdk-qte \
> +
> + ${@base_contains('QT_PROVIDER','qt5','packagegroup-arago-tisdk-qt5','p
> + ackagegroup-arago-tisdk-qte',d)} \
> packagegroup-arago-tisdk-addons \
> packagegroup-arago-tisdk-connectivity \
> packagegroup-arago-tisdk-crypto \
> --
> 1.9.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/5] refresh-screen: convert to Qt5
2014-06-03 14:39 ` Cooper Jr., Franklin
@ 2014-06-03 14:47 ` Denys Dmytriyenko
2014-06-04 15:38 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 14:47 UTC (permalink / raw
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Jun 03, 2014 at 02:39:44PM +0000, Cooper Jr., Franklin wrote:
> It would be nice if we can drop the Qt 5 specific patches and simply allow
> the "clean" sources to work for both Qt 4 and Qt 5.
>
> http://www.kdab.com/automated-porting-from-qt-4-to-qt-5/
> http://stackoverflow.com/questions/18663331/how-to-check-the-selected-version-of-qt-in-a-pro-file
The .pro file should be easy, but the sources are rather involved. It's up to
you if you want to use the method to pre-process the sources to work with qt4
and qt5...
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > Sent: Monday, June 02, 2014 9:30 PM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [PATCH 2/5] refresh-screen: convert to Qt5
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Use qt-provider to build it against Qt4 or Qt5
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > ...een.pro-add-widgets-module-to-the-project.patch | 26
> > ++++++++++++++++++++++ ...place-QtGui-header-with-QtWidgets-for-
> > Qt5.patch | 26 ++++++++++++++++++++++
> > .../recipes-core/matrix/refresh-screen_2.0.bb | 17 +++++++++-----
> > 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 meta-
> > arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> > widgets-module-to-the-project.patch
> > create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-
> > screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
> >
> > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-
> > refresh-screen.pro-add-widgets-module-to-the-project.patch b/meta-arago-
> > extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> > widgets-module-to-the-project.patch
> > new file mode 100644
> > index 0000000..b9a1f80
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-
> > +++ screen.pro-add-widgets-module-to-the-project.patch
> > @@ -0,0 +1,26 @@
> > +From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17 00:00:00
> > 2001
> > +From: Denys Dmytriyenko <denys@ti.com>
> > +Date: Mon, 12 May 2014 21:07:32 -0400
> > +Subject: [PATCH] refresh-screen.pro: add widgets module to the project
> > +for Qt5
> > +
> > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > +---
> > + refresh_screen.pro | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/refresh_screen.pro b/refresh_screen.pro index
> > +afe5c25..a79abd0 100644
> > +--- a/refresh_screen.pro
> > ++++ b/refresh_screen.pro
> > +@@ -4,7 +4,7 @@
> > + #
> > + #-------------------------------------------------
> > +
> > +-QT += core gui
> > ++QT += core gui widgets
> > +
> > + TARGET = refresh_screen
> > + TEMPLATE = app
> > +--
> > +1.9.2
> > +
> > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-
> > Replace-QtGui-header-with-QtWidgets-for-Qt5.patch b/meta-arago-
> > extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-
> > QtWidgets-for-Qt5.patch
> > new file mode 100644
> > index 0000000..66c002d
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-
> > +++ QtGui-header-with-QtWidgets-for-Qt5.patch
> > @@ -0,0 +1,26 @@
> > +From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17 00:00:00
> > 2001
> > +From: Denys Dmytriyenko <denys@ti.com>
> > +Date: Mon, 12 May 2014 21:01:57 -0400
> > +Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5
> > +
> > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > +---
> > + main.cpp | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/main.cpp b/main.cpp
> > +index c5744d8..5a61904 100644
> > +--- a/main.cpp
> > ++++ b/main.cpp
> > +@@ -36,7 +36,7 @@
> > + *
> > + */
> > +
> > +-#include <QtGui/QApplication>
> > ++#include <QtWidgets/QApplication>
> > + #include "mainwindow.h"
> > +
> > + int main(int argc, char *argv[])
> > +--
> > +1.9.2
> > +
> > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > index 2696978..fc41f32 100644
> > --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > @@ -4,21 +4,28 @@ LICENSE = "BSD"
> > LIC_FILES_CHKSUM =
> > "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b527
> > 6496"
> > SECTION = "multimedia"
> >
> > +inherit qt-provider
> > +
> > # Make sure that QT font libraries have been installed -RDEPENDS_${PN} +=
> > "qt4-embedded-fonts"
> > +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
> >
> > -PR = "r4"
> > +PR = "r5"
> >
> > SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3"
> > BRANCH ?= "master"
> >
> > SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh-
> > screen.git;protocol=git;branch=${BRANCH}"
> >
> > -S = "${WORKDIR}/git"
> > +QT5_DIFF = " \
> > +file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
> > +\ file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \ "
> >
> > -inherit qt4e
> > +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '',
> > d)}"
> > +
> > +S = "${WORKDIR}/git"
> >
> > do_install() {
> > install -d ${D}/${bindir}
> > - install -m 0755 ${S}/refresh_screen ${D}/${bindir}
> > + install -m 0755 ${B}/refresh_screen ${D}/${bindir}
> > }
> > --
> > 1.9.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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5
2014-06-03 2:29 ` [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5 Denys Dmytriyenko
@ 2014-06-03 14:48 ` Cooper Jr., Franklin
2014-06-03 15:55 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Cooper Jr., Franklin @ 2014-06-03 14:48 UTC (permalink / raw
To: Denys Dmytriyenko, meta-arago@arago-project.org
Currently we also use ARAGO_QT_PROVIDER to determine if we need to include GLES based applications or not specifically quick-playground.
We also use it to set QT_SGX_SUPPORT in packagegroup-arago-qte-toolchain-target.bb and packagegroup-arago-qte.bb so maybe we need to pull this variable to arago-prefs.inc make it a boolean variable. This way we can still conditional set it to TRUE depending on the Qt 4 version we are using and always set it to true for Qt 5.
Once we fixup the QT_SGX_SUPPORT variable then we can use that variable to determine if a gles application should be pulled in or not.
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> Sent: Monday, June 02, 2014 9:30 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER
> aware of Qt5
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> As ARAGO_QT_PROVIDER is used to select between gles and non-gles versions
> of Qt4, make it aware of Qt5 and set it empty in that case.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-
> arago-distro/conf/distro/include/arago-prefs.inc
> index 6ae11e9..0885acf 100644
> --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> @@ -25,7 +25,7 @@ PREFERRED_VERSION_libdrm = "2.4.46"
>
> PREFERRED_PROVIDER_virtual/gettext = "gettext"
>
> -ARAGO_QT_PROVIDER = "${@base_contains('MACHINE_FEATURES','sgx','qt4-
> embedded-gles','qt4-embedded',d)}"
> +ARAGO_QT_PROVIDER =
> "${@base_contains('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES
> ','sgx','qt4-embedded-gles','qt4-embedded',d),d)}"
> PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
>
> PREFERRED_VERSION_qt4-embedded = "4.8.5"
> --
> 1.9.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5
2014-06-03 14:48 ` Cooper Jr., Franklin
@ 2014-06-03 15:55 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-03 15:55 UTC (permalink / raw
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Jun 03, 2014 at 02:48:12PM +0000, Cooper Jr., Franklin wrote:
> Currently we also use ARAGO_QT_PROVIDER to determine if we need to include
> GLES based applications or not specifically quick-playground.
Right now GLES side of Qt5 apps is not complete and quick-playground is not
ported, so it doesn't make any difference. Once more and more apps are ported
to Qt5, we can look into that.
> We also use it to set QT_SGX_SUPPORT in
> packagegroup-arago-qte-toolchain-target.bb and packagegroup-arago-qte.bb so
> maybe we need to pull this variable to arago-prefs.inc make it a boolean
> variable. This way we can still conditional set it to TRUE depending on the
> Qt 4 version we are using and always set it to true for Qt 5.
Those packagegroups are Qt4 specific and it's still Ok to use that variable
for that purpose. Those packagegroups won't be included when building with Qt5
> Once we fixup the QT_SGX_SUPPORT variable then we can use that variable to
> determine if a gles application should be pulled in or not.
>
>
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > Sent: Monday, June 02, 2014 9:30 PM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER
> > aware of Qt5
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > As ARAGO_QT_PROVIDER is used to select between gles and non-gles versions
> > of Qt4, make it aware of Qt5 and set it empty in that case.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-
> > arago-distro/conf/distro/include/arago-prefs.inc
> > index 6ae11e9..0885acf 100644
> > --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> > +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> > @@ -25,7 +25,7 @@ PREFERRED_VERSION_libdrm = "2.4.46"
> >
> > PREFERRED_PROVIDER_virtual/gettext = "gettext"
> >
> > -ARAGO_QT_PROVIDER = "${@base_contains('MACHINE_FEATURES','sgx','qt4-
> > embedded-gles','qt4-embedded',d)}"
> > +ARAGO_QT_PROVIDER =
> > "${@base_contains('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES
> > ','sgx','qt4-embedded-gles','qt4-embedded',d),d)}"
> > PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
> >
> > PREFERRED_VERSION_qt4-embedded = "4.8.5"
> > --
> > 1.9.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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/5] refresh-screen: convert to Qt5
2014-06-03 14:47 ` Denys Dmytriyenko
@ 2014-06-04 15:38 ` Denys Dmytriyenko
2014-06-04 16:29 ` Cooper Jr., Franklin
0 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2014-06-04 15:38 UTC (permalink / raw
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Jun 03, 2014 at 10:47:37AM -0400, Denys Dmytriyenko wrote:
> On Tue, Jun 03, 2014 at 02:39:44PM +0000, Cooper Jr., Franklin wrote:
> > It would be nice if we can drop the Qt 5 specific patches and simply allow
> > the "clean" sources to work for both Qt 4 and Qt 5.
> >
> > http://www.kdab.com/automated-porting-from-qt-4-to-qt-5/
> > http://stackoverflow.com/questions/18663331/how-to-check-the-selected-version-of-qt-in-a-pro-file
>
> The .pro file should be easy, but the sources are rather involved. It's up to
> you if you want to use the method to pre-process the sources to work with qt4
> and qt5...
Franklin,
So, how would you like to proceed in this case? You own the source repository.
Do you want me to submit a patch for .pro file change? I don't feel very
comfortable with the .cpp changes suggested in the first link - looked finicky
to me. I'll leave that to you to decide.
As of this patch - do you want me to push it as is for now or should I wait
for the source change?
--
Denys
> > > -----Original Message-----
> > > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > > Sent: Monday, June 02, 2014 9:30 PM
> > > To: meta-arago@arago-project.org
> > > Subject: [meta-arago] [PATCH 2/5] refresh-screen: convert to Qt5
> > >
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > Use qt-provider to build it against Qt4 or Qt5
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > ---
> > > ...een.pro-add-widgets-module-to-the-project.patch | 26
> > > ++++++++++++++++++++++ ...place-QtGui-header-with-QtWidgets-for-
> > > Qt5.patch | 26 ++++++++++++++++++++++
> > > .../recipes-core/matrix/refresh-screen_2.0.bb | 17 +++++++++-----
> > > 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 meta-
> > > arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> > > widgets-module-to-the-project.patch
> > > create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-
> > > screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
> > >
> > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-
> > > refresh-screen.pro-add-widgets-module-to-the-project.patch b/meta-arago-
> > > extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> > > widgets-module-to-the-project.patch
> > > new file mode 100644
> > > index 0000000..b9a1f80
> > > --- /dev/null
> > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-
> > > +++ screen.pro-add-widgets-module-to-the-project.patch
> > > @@ -0,0 +1,26 @@
> > > +From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17 00:00:00
> > > 2001
> > > +From: Denys Dmytriyenko <denys@ti.com>
> > > +Date: Mon, 12 May 2014 21:07:32 -0400
> > > +Subject: [PATCH] refresh-screen.pro: add widgets module to the project
> > > +for Qt5
> > > +
> > > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > +---
> > > + refresh_screen.pro | 2 +-
> > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > +
> > > +diff --git a/refresh_screen.pro b/refresh_screen.pro index
> > > +afe5c25..a79abd0 100644
> > > +--- a/refresh_screen.pro
> > > ++++ b/refresh_screen.pro
> > > +@@ -4,7 +4,7 @@
> > > + #
> > > + #-------------------------------------------------
> > > +
> > > +-QT += core gui
> > > ++QT += core gui widgets
> > > +
> > > + TARGET = refresh_screen
> > > + TEMPLATE = app
> > > +--
> > > +1.9.2
> > > +
> > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-
> > > Replace-QtGui-header-with-QtWidgets-for-Qt5.patch b/meta-arago-
> > > extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-
> > > QtWidgets-for-Qt5.patch
> > > new file mode 100644
> > > index 0000000..66c002d
> > > --- /dev/null
> > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-
> > > +++ QtGui-header-with-QtWidgets-for-Qt5.patch
> > > @@ -0,0 +1,26 @@
> > > +From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17 00:00:00
> > > 2001
> > > +From: Denys Dmytriyenko <denys@ti.com>
> > > +Date: Mon, 12 May 2014 21:01:57 -0400
> > > +Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5
> > > +
> > > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > +---
> > > + main.cpp | 2 +-
> > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > +
> > > +diff --git a/main.cpp b/main.cpp
> > > +index c5744d8..5a61904 100644
> > > +--- a/main.cpp
> > > ++++ b/main.cpp
> > > +@@ -36,7 +36,7 @@
> > > + *
> > > + */
> > > +
> > > +-#include <QtGui/QApplication>
> > > ++#include <QtWidgets/QApplication>
> > > + #include "mainwindow.h"
> > > +
> > > + int main(int argc, char *argv[])
> > > +--
> > > +1.9.2
> > > +
> > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > index 2696978..fc41f32 100644
> > > --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > @@ -4,21 +4,28 @@ LICENSE = "BSD"
> > > LIC_FILES_CHKSUM =
> > > "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b527
> > > 6496"
> > > SECTION = "multimedia"
> > >
> > > +inherit qt-provider
> > > +
> > > # Make sure that QT font libraries have been installed -RDEPENDS_${PN} +=
> > > "qt4-embedded-fonts"
> > > +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
> > >
> > > -PR = "r4"
> > > +PR = "r5"
> > >
> > > SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3"
> > > BRANCH ?= "master"
> > >
> > > SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh-
> > > screen.git;protocol=git;branch=${BRANCH}"
> > >
> > > -S = "${WORKDIR}/git"
> > > +QT5_DIFF = " \
> > > +file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
> > > +\ file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \ "
> > >
> > > -inherit qt4e
> > > +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '',
> > > d)}"
> > > +
> > > +S = "${WORKDIR}/git"
> > >
> > > do_install() {
> > > install -d ${D}/${bindir}
> > > - install -m 0755 ${S}/refresh_screen ${D}/${bindir}
> > > + install -m 0755 ${B}/refresh_screen ${D}/${bindir}
> > > }
> > > --
> > > 1.9.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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/5] refresh-screen: convert to Qt5
2014-06-04 15:38 ` Denys Dmytriyenko
@ 2014-06-04 16:29 ` Cooper Jr., Franklin
0 siblings, 0 replies; 14+ messages in thread
From: Cooper Jr., Franklin @ 2014-06-04 16:29 UTC (permalink / raw
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
Feel free to push your patch now. I'll deal with the sources and bump the SRCREV later.
> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Wednesday, June 04, 2014 10:39 AM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 2/5] refresh-screen: convert to Qt5
>
> On Tue, Jun 03, 2014 at 10:47:37AM -0400, Denys Dmytriyenko wrote:
> > On Tue, Jun 03, 2014 at 02:39:44PM +0000, Cooper Jr., Franklin wrote:
> > > It would be nice if we can drop the Qt 5 specific patches and simply
> > > allow the "clean" sources to work for both Qt 4 and Qt 5.
> > >
> > > http://www.kdab.com/automated-porting-from-qt-4-to-qt-5/
> > > http://stackoverflow.com/questions/18663331/how-to-check-the-selecte
> > > d-version-of-qt-in-a-pro-file
> >
> > The .pro file should be easy, but the sources are rather involved.
> > It's up to you if you want to use the method to pre-process the
> > sources to work with qt4 and qt5...
>
> Franklin,
>
> So, how would you like to proceed in this case? You own the source
> repository.
> Do you want me to submit a patch for .pro file change? I don't feel very
> comfortable with the .cpp changes suggested in the first link - looked finicky
> to me. I'll leave that to you to decide.
>
> As of this patch - do you want me to push it as is for now or should I wait for
> the source change?
>
> --
> Denys
>
>
> > > > -----Original Message-----
> > > > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > > > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > > > Sent: Monday, June 02, 2014 9:30 PM
> > > > To: meta-arago@arago-project.org
> > > > Subject: [meta-arago] [PATCH 2/5] refresh-screen: convert to Qt5
> > > >
> > > > From: Denys Dmytriyenko <denys@ti.com>
> > > >
> > > > Use qt-provider to build it against Qt4 or Qt5
> > > >
> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > ---
> > > > ...een.pro-add-widgets-module-to-the-project.patch | 26
> > > > ++++++++++++++++++++++ ...place-QtGui-header-with-QtWidgets-for-
> > > > Qt5.patch | 26 ++++++++++++++++++++++
> > > > .../recipes-core/matrix/refresh-screen_2.0.bb | 17 +++++++++-----
> > > > 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644
> meta-
> > > > arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-
> screen.pro-add-
> > > > widgets-module-to-the-project.patch
> > > > create mode 100644 meta-arago-extras/recipes-core/matrix/refresh-
> > > > screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch
> > > >
> > > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-
> > > > refresh-screen.pro-add-widgets-module-to-the-project.patch b/meta-
> arago-
> > > > extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-
> > > > widgets-module-to-the-project.patch
> > > > new file mode 100644
> > > > index 0000000..b9a1f80
> > > > --- /dev/null
> > > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-
> refresh-
> > > > +++ screen.pro-add-widgets-module-to-the-project.patch
> > > > @@ -0,0 +1,26 @@
> > > > +From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17
> 00:00:00
> > > > 2001
> > > > +From: Denys Dmytriyenko <denys@ti.com>
> > > > +Date: Mon, 12 May 2014 21:07:32 -0400
> > > > +Subject: [PATCH] refresh-screen.pro: add widgets module to the project
> > > > +for Qt5
> > > > +
> > > > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > +---
> > > > + refresh_screen.pro | 2 +-
> > > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/refresh_screen.pro b/refresh_screen.pro index
> > > > +afe5c25..a79abd0 100644
> > > > +--- a/refresh_screen.pro
> > > > ++++ b/refresh_screen.pro
> > > > +@@ -4,7 +4,7 @@
> > > > + #
> > > > + #-------------------------------------------------
> > > > +
> > > > +-QT += core gui
> > > > ++QT += core gui widgets
> > > > +
> > > > + TARGET = refresh_screen
> > > > + TEMPLATE = app
> > > > +--
> > > > +1.9.2
> > > > +
> > > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-
> > > > Replace-QtGui-header-with-QtWidgets-for-Qt5.patch b/meta-arago-
> > > > extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-
> with-
> > > > QtWidgets-for-Qt5.patch
> > > > new file mode 100644
> > > > index 0000000..66c002d
> > > > --- /dev/null
> > > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-
> Replace-
> > > > +++ QtGui-header-with-QtWidgets-for-Qt5.patch
> > > > @@ -0,0 +1,26 @@
> > > > +From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17
> 00:00:00
> > > > 2001
> > > > +From: Denys Dmytriyenko <denys@ti.com>
> > > > +Date: Mon, 12 May 2014 21:01:57 -0400
> > > > +Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5
> > > > +
> > > > +Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > +---
> > > > + main.cpp | 2 +-
> > > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/main.cpp b/main.cpp
> > > > +index c5744d8..5a61904 100644
> > > > +--- a/main.cpp
> > > > ++++ b/main.cpp
> > > > +@@ -36,7 +36,7 @@
> > > > + *
> > > > + */
> > > > +
> > > > +-#include <QtGui/QApplication>
> > > > ++#include <QtWidgets/QApplication>
> > > > + #include "mainwindow.h"
> > > > +
> > > > + int main(int argc, char *argv[])
> > > > +--
> > > > +1.9.2
> > > > +
> > > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > > b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > > index 2696978..fc41f32 100644
> > > > --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
> > > > @@ -4,21 +4,28 @@ LICENSE = "BSD"
> > > > LIC_FILES_CHKSUM =
> > > >
> "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b527
> > > > 6496"
> > > > SECTION = "multimedia"
> > > >
> > > > +inherit qt-provider
> > > > +
> > > > # Make sure that QT font libraries have been installed -RDEPENDS_${PN}
> +=
> > > > "qt4-embedded-fonts"
> > > > +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
> > > >
> > > > -PR = "r4"
> > > > +PR = "r5"
> > > >
> > > > SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3"
> > > > BRANCH ?= "master"
> > > >
> > > > SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh-
> > > > screen.git;protocol=git;branch=${BRANCH}"
> > > >
> > > > -S = "${WORKDIR}/git"
> > > > +QT5_DIFF = " \
> > > > +file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch
> > > > +\ file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \ "
> > > >
> > > > -inherit qt4e
> > > > +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}",
> '',
> > > > d)}"
> > > > +
> > > > +S = "${WORKDIR}/git"
> > > >
> > > > do_install() {
> > > > install -d ${D}/${bindir}
> > > > - install -m 0755 ${S}/refresh_screen ${D}/${bindir}
> > > > + install -m 0755 ${B}/refresh_screen ${D}/${bindir}
> > > > }
> > > > --
> > > > 1.9.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
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-06-04 16:29 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-03 2:29 [PATCH 0/5] qt5-related fixes Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 1/5] qt-tstat: fix install with Qt5, broken by latest change Denys Dmytriyenko
2014-06-03 14:33 ` Cooper Jr., Franklin
2014-06-03 2:29 ` [PATCH 2/5] refresh-screen: convert to Qt5 Denys Dmytriyenko
2014-06-03 14:39 ` Cooper Jr., Franklin
2014-06-03 14:47 ` Denys Dmytriyenko
2014-06-04 15:38 ` Denys Dmytriyenko
2014-06-04 16:29 ` Cooper Jr., Franklin
2014-06-03 2:29 ` [PATCH 3/5] arago-prefs: make ARAGO_QT_PROVIDER aware of Qt5 Denys Dmytriyenko
2014-06-03 14:48 ` Cooper Jr., Franklin
2014-06-03 15:55 ` Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 4/5] packagegroup-*-qt5: add Qt5 versions of arago packagegroups Denys Dmytriyenko
2014-06-03 2:29 ` [PATCH 5/5] tisdk-rootfs-image: use correct packagegroup for Qt4/Qt5 Denys Dmytriyenko
2014-06-03 14:40 ` Cooper Jr., Franklin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.