diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-09-09 11:41:44 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-09 11:41:44 +0000 |
commit | e4ef6eacfb2280a4d63cd569d691280fdf6b0e8f (patch) | |
tree | 08350103aa1a9fad46a2858ea49b014afddd70aa /packages/qt | |
parent | 5fff1e40328e6ab7967b55fbcd717c29d68a1d3f (diff) | |
parent | d6833d3ab6f6b0c4078c9d0c46cb9d5dd0faea58 (diff) |
merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
and '60271e29029910207b8512833d049fad50fb282b'
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" |