summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-12-05 13:28:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-05 15:26:41 +0000
commit166a0ca486f5ff6c457eb5a096c383d01c84230b (patch)
tree9f62714c120c84c062430ff9c881873152b83f20 /meta/recipes-qt
parent3e47343675fbdc49a6e39c393e14041294772cdd (diff)
downloadpoky-166a0ca486f5ff6c457eb5a096c383d01c84230b.tar.gz
fotowall: tidy up
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already * Remove pkgconfig from inherit since quicky doesn't actually use pkg-config nor does it produce a .pc file * Move packaging definitions to the end (From OE-Core rev: e5e6a02923ca28dd6863dcf96c1d0619f049c64a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt-apps/fotowall_0.9.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 3cb79a31a2..2e1fbaaec2 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
7 file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" 7 file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
8SECTION = "x11/apps" 8SECTION = "x11/apps"
9 9
10PR = "r3" 10PR = "r4"
11
12DEPENDS = "qt4-x11-free"
13RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
14 11
15SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \ 12SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
16 file://ExportWizard-depends-on-ui_wizard.patch \ 13 file://ExportWizard-depends-on-ui_wizard.patch \
@@ -21,10 +18,13 @@ SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046d
21 18
22S = "${WORKDIR}/Fotowall-${PV}" 19S = "${WORKDIR}/Fotowall-${PV}"
23 20
24inherit qmake2 pkgconfig 21inherit qt4x11
25 22
26EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam" 23EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam"
27 24
28do_install() { 25do_install() {
29 oe_runmake INSTALL_ROOT=${D} install 26 oe_runmake INSTALL_ROOT=${D} install
30} 27}
28
29# Ensure we have some plugins for some useful image formats
30RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"