[oe-commits] org.oe.dev Qt4 based applications: Do not inherit qmake when building for Qt4/X11

[freyther commit]

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.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: d88d10fdc5c1115998b233404a87ebf39be404cc
ViewMTN: http://monotone.openembedded.org/revision/info/d88d10fdc5c1115998b233404a87ebf39be404cc
Files:
1
packages/libqanava/libqanava_0.0.7.bb
packages/mkbot/mkbot_0.3.bb
packages/opie-reader/uqtreader_cvs.bb
packages/qsvn/qsvn_0.3.0.bb
packages/qxmp/qxmp_1.0.bb
packages/texmaker/texmaker_1.3.bb
Diffs:

#
# mt diff -r1729c6fe4545d2f2927034bbe8ac992b569aaf13 -rd88d10fdc5c1115998b233404a87ebf39be404cc
#
# 
# 
# patch "packages/libqanava/libqanava_0.0.7.bb"
#  from [13031ac0ff177ebaa8c584d07c4999576a8c6219]
#    to [3e3955b8d31e3697bcab7b6779ec7788aa7b09f2]
# 
# patch "packages/mkbot/mkbot_0.3.bb"
#  from [94faa4fbee0a91b55a0efba3abbed0ccda53190c]
#    to [fc500581f870bcb7d466b7220ed8d247599bb626]
# 
# patch "packages/opie-reader/uqtreader_cvs.bb"
#  from [61873b6271c2f1decde3ab439dda692a2aa98a36]
#    to [5a3fde92d074cd092fad631555d293ec71fe1c78]
# 
# patch "packages/qsvn/qsvn_0.3.0.bb"
#  from [70ce70cd2a14e148b93ed7445cd8cc4346f799c7]
#    to [81f5fd5e5a7d33ff503495f7254a9ae123bacac7]
# 
# patch "packages/qxmp/qxmp_1.0.bb"
#  from [8f00c929b130f5c608826d9e7457f7d9783e0fb0]
#    to [691fb52466f95dcf87239fc9189d83548146c758]
# 
# patch "packages/texmaker/texmaker_1.3.bb"
#  from [c837721d4bd4e0060e54a8e6976a06f7912fc5c3]
#    to [2c52212d629c17bb3f497280943e0589792ed8a0]
# 
============================================================
--- packages/libqanava/libqanava_0.0.7.bb	13031ac0ff177ebaa8c584d07c4999576a8c6219
+++ packages/libqanava/libqanava_0.0.7.bb	3e3955b8d31e3697bcab7b6779ec7788aa7b09f2
@@ -8,7 +8,7 @@ S = "${WORKDIR}/qanava-${PV}"
 SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz"
 S = "${WORKDIR}/qanava-${PV}"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 PARALLEL_MAKE = ""
 
============================================================
--- packages/mkbot/mkbot_0.3.bb	94faa4fbee0a91b55a0efba3abbed0ccda53190c
+++ packages/mkbot/mkbot_0.3.bb	fc500581f870bcb7d466b7220ed8d247599bb626
@@ -8,6 +8,6 @@ S = "${WORKDIR}/MKbot-0.3"
 SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2"
 S = "${WORKDIR}/MKbot-0.3"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 #FIXME: lacks packaging
============================================================
--- packages/opie-reader/uqtreader_cvs.bb	61873b6271c2f1decde3ab439dda692a2aa98a36
+++ packages/opie-reader/uqtreader_cvs.bb	5a3fde92d074cd092fad631555d293ec71fe1c78
@@ -17,7 +17,7 @@ export OPIEDIR="${S}/opiedir"
 
 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}"
============================================================
--- packages/qsvn/qsvn_0.3.0.bb	70ce70cd2a14e148b93ed7445cd8cc4346f799c7
+++ packages/qsvn/qsvn_0.3.0.bb	81f5fd5e5a7d33ff503495f7254a9ae123bacac7
@@ -10,7 +10,7 @@ SRC_URI = "http://download2.berlios.de/q
 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"
 
============================================================
--- packages/qxmp/qxmp_1.0.bb	8f00c929b130f5c608826d9e7457f7d9783e0fb0
+++ packages/qxmp/qxmp_1.0.bb	691fb52466f95dcf87239fc9189d83548146c758
@@ -6,7 +6,7 @@ SRC_URI = "http://www.xm1math.net/qxmp/q
 
 SRC_URI = "http://www.xm1math.net/qxmp/qxmp-${PV}.tar.bz2"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 do_install() {
 	install -d ${D}${bindir}
============================================================
--- packages/texmaker/texmaker_1.3.bb	c837721d4bd4e0060e54a8e6976a06f7912fc5c3
+++ packages/texmaker/texmaker_1.3.bb	2c52212d629c17bb3f497280943e0589792ed8a0
@@ -5,7 +5,7 @@ SRC_URI = "http://www.xm1math.net/texmak
 
 SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2"
 
-inherit qmake qt4x11
+inherit qt4x11
 
 do_install() {
 	install -d ${D}${bindir}