From: Denys Dmytriyenko <denys@ti.com>
To: Jacob Stiffler <j-stiffler@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH] dual-camera-demo: patch Makefile.build to work with Qt5
Date: Wed, 4 Mar 2015 14:49:59 -0500 [thread overview]
Message-ID: <20150304194959.GJ6052@edge> (raw)
In-Reply-To: <1425498278-22639-1-git-send-email-j-stiffler@ti.com>
On Wed, Mar 04, 2015 at 02:44:38PM -0500, Jacob Stiffler wrote:
> Makefile.build is only used when building from within SDK through a
> top-level SDK Makefile.
Will it break qt4?
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 ++++++++++++++++++++
> .../dual-camera-demo/dual-camera-demo_1.0.bb | 3 +-
> 2 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch
>
> diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch
> new file mode 100644
> index 0000000..a544c87
> --- /dev/null
> +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch
> @@ -0,0 +1,31 @@
> +From 42653f94bbaff15d04ec527add6eeb3082ab4873 Mon Sep 17 00:00:00 2001
> +From: Jacob Stiffler <j-stiffler@ti.com>
> +Date: Wed, 4 Mar 2015 12:00:45 -0500
> +Subject: [PATCH] Makefile.build: with Qt5 use qmake available in PATH
> +
> +Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> +---
> + Makefile.build | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.build b/Makefile.build
> +index d715722..fdea3d8 100644
> +--- a/Makefile.build
> ++++ b/Makefile.build
> +@@ -9,11 +9,11 @@ all: release
> + .PHONY: qmake
> + qmake : dual_camera.pro
> + @. ${ENV_SETUP}; \
> +- qmake2 CONFIG+=release dual_camera.pro
> ++ qmake CONFIG+=release dual_camera.pro
> +
> + qmake_debug : dual_camera.pro
> + @. ${ENV_SETUP}; \
> +- qmake2 CONFIG+=debug dual_camera.pro
> ++ qmake CONFIG+=debug dual_camera.pro
> +
> + debug : qmake_debug
> + @. ${ENV_SETUP}; \
> +--
> +1.7.9.5
> +
> diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> index 7893d01..f1e6e79 100644
> --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
> DEPENDS += "libdrm"
> require recipes-core/matrix/matrix-gui-paths.inc
>
> -PR = "r6"
> +PR = "r7"
>
> BRANCH = "drm"
> SRCREV = "0c48cb66cc995420dfec2f1fd620c8977f0170aa"
> @@ -17,6 +17,7 @@ SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=gi
> file://dual_camera_qt5.sh \
> file://dual_camera_qt4.sh \
> file://dual-camera.desktop \
> + file://0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch \
> "
>
> S = "${WORKDIR}/git"
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
prev parent reply other threads:[~2015-03-04 19:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 19:44 [PATCH] dual-camera-demo: patch Makefile.build to work with Qt5 Jacob Stiffler
2015-03-04 19:49 ` Denys Dmytriyenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150304194959.GJ6052@edge \
--to=denys@ti.com \
--cc=j-stiffler@ti.com \
--cc=meta-arago@arago-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.