On Thu, May 29, 2014 at 01:38:06PM -0500, Franklin S. Cooper Jr wrote: > * This insures that Qt users will have qmake generate "Makefile" instead of > App-Makefile which is the expected/default behavior.
Franklin, Can you please re-submit this one patch as well? As refresh-screen recipe has been updated with Qt5 support and this no longer applies. Thanks. > Signed-off-by: Franklin S. Cooper Jr <[email protected]> > --- > .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 4 ++-- > .../recipes-core/matrix/refresh-screen_2.0.bb | 4 ++-- > .../recipes-qt/qt-apps/qt-tstat_2.0.bb | 4 ++-- > .../recipes-qt/qt-apps/quick-playground_1.0.bb | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb > b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb > index 7d47e5b..afd5aa3 100644 > --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb > @@ -11,9 +11,9 @@ RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" > > DEPENDS += "${QT_DEPENDS_WEBKIT}" > > -PR = "r6" > +PR = "r7" > > -SRCREV = "8517ac2338295ccb4c6c2ffa58b5ad48659a5430" > +SRCREV = "7f5dccfb5b1b68a3f9162f6ee072eef0e0ba06fe" > BRANCH ?= "master" > > SRC_URI = > "git://gitorious.org/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}" > 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..e3d59e2 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 > @@ -7,9 +7,9 @@ SECTION = "multimedia" > # Make sure that QT font libraries have been installed > RDEPENDS_${PN} += "qt4-embedded-fonts" > > -PR = "r4" > +PR = "r5" > > -SRCREV = "4dfdf85f17033f950e01f25341665f979edde6c3" > +SRCREV = "ad3835b250c8b2b55ae65ffa19c2b85e412826b0" > BRANCH ?= "master" > > SRC_URI = > "git://gitorious.org/matrix-gui-v2/refresh-screen.git;protocol=git;branch=${BRANCH}" > 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..0e3fc01 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,12 +12,12 @@ require recipes-core/matrix/matrix-gui-paths.inc > > inherit qt-provider > > -PR = "r7" > +PR = "r8" > > DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}" > > BRANCH ?= "master" > -SRCREV = "2960431fd38239cc089c8738776f3ff9dcfe7f1c" > +SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072" > > SRC_URI = " \ > git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \ > diff --git a/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb > b/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb > index 5f493d3..2da5a36 100644 > --- a/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb > +++ b/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb > @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = > "file://Licence.txt;md5=7cc88160b55ec5db6c6c5bb8e3238c0b" > > require recipes-core/matrix/matrix-gui-paths.inc > > -PR = "r1" > +PR = "r2" > > BRANCH = "master" > -SRCREV = "0be45ce805147798c98b2dee65e41de67bfcea5d" > +SRCREV = "4bcf4e7f5aa68dcd28f54bf921c6cc3985ce4305" > > SRC_URI = > "git://arago-project.org/git/projects/qt4-demos.git;protocol=git;branch=${BRANCH}" > > -- > 1.7.0.4 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
