diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-09-08 23:42:09 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-09-08 23:42:09 +0000 |
| commit | 7a1b68206fc952bd82d18a6d8018b24fcffa868e (patch) | |
| tree | 51570fe3f2241576294885b3a99736c446d4d83a /classes | |
| parent | 526947c682d653002c868b36adac889f3bf2d02e (diff) | |
| parent | 42a372d72247596d89ad70f3a2ec3b00dd6b412c (diff) | |
merge of '0586913037c8e52dc1d456b0d681720a0d6a1580'
and '371291ba5b2d3d86534d42fdb26b7e29b9e18bff'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake_base.bbclass (renamed from classes/qmake-base.bbclass) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index b45e54ca6a..34f59ef9f7 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -1,4 +1,4 @@ -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake-native " diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 86f1439b30..d0f59d2cd4 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -1,7 +1,7 @@ # # QMake variables for Qt4 # -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " diff --git a/classes/qmake-base.bbclass b/classes/qmake_base.bbclass index 52f6d830a0..ea8903c278 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake_base.bbclass @@ -31,7 +31,7 @@ oe_qmake_mkspecs () { done } -qmake-base_do_configure() { +qmake_base_do_configure() { case ${QMAKESPEC} in *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) ;; |