aboutsummaryrefslogtreecommitdiff
path: root/recipes-qtopia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 12:13:40 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 12:15:19 +1200
commit334999487abd3ccf9eadde88c2b9486455325a90 (patch)
tree7c9d6c112df6696d203ea81830f839428328eaca /recipes-qtopia
parentc8fbef02f9eb9aeb394fe46996d216b8850c2374 (diff)
downloadmeta-opie-334999487abd3ccf9eadde88c2b9486455325a90.zip
meta-opie-334999487abd3ccf9eadde88c2b9486455325a90.tar.gz
meta-opie-334999487abd3ccf9eadde88c2b9486455325a90.tar.bz2
classes/qmake_base_legacy: replace qmake_base
Copy in qmake_base from meta-qt4 (where it was moved from openembedded-core recently) and rename it to qmake_base_legacy. (We don't want to depend on meta-qt4 just for this, but we also should avoid a name clash.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-qtopia')
-rw-r--r--recipes-qtopia/nonworking/zethereal/zethereal_1.0.0.bb2
-rw-r--r--recipes-qtopia/snes9x/snes9x-sdl-qpe_1.39.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qtopia/nonworking/zethereal/zethereal_1.0.0.bb b/recipes-qtopia/nonworking/zethereal/zethereal_1.0.0.bb
index c17e130..f24ca3b 100644
--- a/recipes-qtopia/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/recipes-qtopia/nonworking/zethereal/zethereal_1.0.0.bb
@@ -8,7 +8,7 @@ APPTYPE = "binary"
APPDESKTOP = "${WORKDIR}"
PR = "r0"
-inherit autotools qmake_base
+inherit autotools qmake_base_legacy
EXTRA_OECONF = "--disable-ethereal \
--enable-tethereal \
diff --git a/recipes-qtopia/snes9x/snes9x-sdl-qpe_1.39.bb b/recipes-qtopia/snes9x/snes9x-sdl-qpe_1.39.bb
index 51de404..a165fa6 100644
--- a/recipes-qtopia/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/recipes-qtopia/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/snes9x-sdl-${PV}"
FILESEXTRAPATHS_prepend := "${THISDIR}/snes9x-sdl:"
-inherit qmake_base palmtop-defs
+inherit qmake_base_legacy palmtop-defs
QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'