summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt-apps
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-12-05 13:28:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-05 15:26:41 +0000
commit7f7806439944d7515cc95c7ed6004673d2f446d0 (patch)
treea1c7ecf37470305c8896781b8c1a7cad46127d50 /meta/recipes-qt/qt-apps
parent166a0ca486f5ff6c457eb5a096c383d01c84230b (diff)
downloadpoky-7f7806439944d7515cc95c7ed6004673d2f446d0.tar.gz
poky-7f7806439944d7515cc95c7ed6004673d2f446d0.tar.bz2
poky-7f7806439944d7515cc95c7ed6004673d2f446d0.zip
qmmp: remove qmake2 from inherit
qt4x11 already inherits qmake2 so it doesn't need to be inherited again. (From OE-Core rev: ed96c0a6a5a394842777a1413b89d3ea3aabb532) 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/qt-apps')
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.6.1.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
index 906802555a..ed096e9ef4 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
@@ -5,7 +5,7 @@ LICENSE_FLAGS = "commercial"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SECTION = "multimedia"
-PR = "r0"
+PR = "r1"
DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
@@ -14,8 +14,7 @@ SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "23a1a3aa924da901ebc8327ea76135d4"
SRC_URI[sha256sum] = "b48be8c0e3882088919a77ce7b619cfc99d32af29cc688ba8749a58cbb25fb6f"
-
-inherit qmake2 cmake qt4x11
+inherit cmake qt4x11
export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \