summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-09 02:26:11 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-09 02:26:11 +0000
commit17d6e95ab3b0dbf02259d12d42828c850c574e96 (patch)
tree451266951d17a6790ece2b22a3b5002cf01dcc72
parent1827f7e5131f6f4c821c844fae4eb1788696d1af (diff)
qmake_base: Fix packages that refer to qmake-base instead of qmake_base. OE needs a class files naming convention - choose hyphens or underscores, not both.
-rw-r--r--packages/opie-reader/uqtreader_cvs.bb2
-rw-r--r--packages/qt/qt-x11-free-common.inc2
-rw-r--r--packages/qt/qt4-x11-free_4.3.0.bb2
-rw-r--r--packages/snes9x/snes9x-sdl-qpe_1.39.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/opie-reader/uqtreader_cvs.bb b/packages/opie-reader/uqtreader_cvs.bb
index 04b03243c4..9fb7af2db5 100644
--- 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 qmake_base qt4x11
do_configure() {
${OE_QMAKE_QMAKE} -recursive opie-reader.pro UQT_DATADIR="${datadir}/${PN}" UQT_LIBDIR="${libdir}/${PN}"
diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc
index cb4ed12f8d..a68575d601 100644
--- a/packages/qt/qt-x11-free-common.inc
+++ b/packages/qt/qt-x11-free-common.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.trolltech.com"
S = "${WORKDIR}/qt-x11-free-${PV}"
-inherit qmake-base qt3x11
+inherit qmake_base qt3x11
export QTDIR = "${S}"
STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb
index 8d68642417..a097c4e9ca 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.0.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
PARALLEL_MAKE = ""
-inherit qmake-base qt4x11
+inherit qmake_base qt4x11
export QTDIR = "${S}"
STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index adf49650d9..00e9fa0791 100644
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/snes9x-sdl-${PV}"
FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE_DIRNAME}/snes9x-sdl:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
-inherit qmake-base
+inherit qmake_base
QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'