diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-09 21:36:58 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-09 21:36:58 +0000 |
commit | 68c1896202e12376543b4bfafe48fc053f8d38b9 (patch) | |
tree | 32e23849e500b26b4c3c523ae30f53e4b5734822 /packages/qt | |
parent | f13935215c790b58ba20b0bd570802288bf3f0b2 (diff) | |
parent | 09d44c043f33b47b7d577f51a62bd414ea2e94aa (diff) |
merge of '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'
and '7d51500e1f981f891b494ca3d396c965faecc9e0'
Diffstat (limited to 'packages/qt')
-rw-r--r-- | packages/qt/qt-x11-free-common.inc | 2 | ||||
-rw-r--r-- | packages/qt/qt-x11-free-native_3.3.5.bb | 2 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free_4.1.2.bb | 2 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free_4.3.0.bb | 2 |
4 files changed, 4 insertions, 4 deletions
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/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb index bd1c8e2598..2ed3da49b5 100644 --- a/packages/qt/qt-x11-free-native_3.3.5.bb +++ b/packages/qt/qt-x11-free-native_3.3.5.bb @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ S = "${WORKDIR}/qt-x11-free-${PV}" # -# FIXME - This should be updated to use OE's qmake-base.oeclass +# FIXME - This should be updated to use OE's qmake_base.oeclass # or the full qmake.oeclass. # diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb index 32eb3ced35..91ac3f68cf 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" PARALLEL_MAKE = "" -inherit qmake-base qt4x11 pkgconfig +inherit qmake_base qt4x11 pkgconfig export QTDIR = "${S}" STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" 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" |