Patchwork [2/3] qmmp: remove qmake2 from inherit

login
register
mail settings
Submitter Paul Eggleton
Date Dec. 5, 2012, 1:28 p.m.
Message ID <794fc28306e3d22c82515eaf4a42ff1d5776da74.1354713989.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/40433/
State Accepted
Commit 7f7806439944d7515cc95c7ed6004673d2f446d0
Headers show

Comments

Paul Eggleton - Dec. 5, 2012, 1:28 p.m.
qt4x11 already inherits qmake2 so it doesn't need to be inherited again.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt-apps/qmmp_0.6.1.bb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

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 9068025..ed096e9 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} \