Qt4 based applications: Do not inherit qmake when building for Qt4/X11

    inherit qmake will download Qt3 and build parts of it, we don't want that.

diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb
index 3207533..5edf141 100644 (file)
--- a/packages/libqanava/libqanava_0.0.7.bb
+++ b/packages/libqanava/libqanava_0.0.7.bb
@@ -8,7 +8,7 @@ PR = "r0"
 SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz"
 S = "${WORKDIR}/qanava-${PV}"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 PARALLEL_MAKE = ""
 

diff --git a/packages/mkbot/mkbot_0.3.bb b/packages/mkbot/mkbot_0.3.bb
index 195d74c..92df433 100644 (file)
--- a/packages/mkbot/mkbot_0.3.bb
+++ b/packages/mkbot/mkbot_0.3.bb
@@ -8,6 +8,6 @@ SECTION = "network"
 SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2"
 S = "${WORKDIR}/MKbot-0.3"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 #FIXME: lacks packaging

diff --git a/packages/opie-reader/uqtreader_cvs.bb b/packages/opie-reader/uqtreader_cvs.bb
index 9fb7af2..9b7ae57 100644 (file)
--- a/packages/opie-reader/uqtreader_cvs.bb
+++ b/packages/opie-reader/uqtreader_cvs.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/opie-reader"
 
 export OPIEDIR="${S}/opiedir"
 
-inherit qmake_base qt4x11
+inherit qt4x11
 
 do_configure() {
        ${OE_QMAKE_QMAKE} -recursive opie-reader.pro UQT_DATADIR="${datadir}/${PN}" UQT_LIBDIR="${libdir}/${PN}"

diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb
index 575e935..c96976f 100644 (file)
--- a/packages/qsvn/qsvn_0.3.0.bb
+++ b/packages/qsvn/qsvn_0.3.0.bb
@@ -10,7 +10,7 @@ PR = "r0"
 SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \
         file://build.patch;patch=1"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1"
 

diff --git a/packages/qxmp/qxmp_1.0.bb b/packages/qxmp/qxmp_1.0.bb
index e0a1aca..bad972d 100644 (file)
--- a/packages/qxmp/qxmp_1.0.bb
+++ b/packages/qxmp/qxmp_1.0.bb
@@ -6,7 +6,7 @@ RDEPENDS = "mplayer"
 
 SRC_URI = "http://www.xm1math.net/qxmp/qxmp-${PV}.tar.bz2"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 do_install() {
        install -d ${D}${bindir}

diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb
index 5682338..b612302 100644 (file)
--- a/packages/texmaker/texmaker_1.3.bb
+++ b/packages/texmaker/texmaker_1.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 do_install() {
        install -d ${D}${bindir}