diff options
Diffstat (limited to 'meta/classes/qmake_base.bbclass')
-rw-r--r-- | meta/classes/qmake_base.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index ea8903c278..24a0f11f46 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass | |||
@@ -39,7 +39,7 @@ qmake_base_do_configure() { | |||
39 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec | 39 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec |
40 | ;; | 40 | ;; |
41 | *) | 41 | *) |
42 | oenote Searching for qmake spec file | 42 | bbnote Searching for qmake spec file |
43 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" | 43 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" |
44 | paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" | 44 | paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" |
45 | 45 | ||
@@ -55,7 +55,7 @@ qmake_base_do_configure() { | |||
55 | ;; | 55 | ;; |
56 | esac | 56 | esac |
57 | 57 | ||
58 | oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" | 58 | bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" |
59 | 59 | ||
60 | if [ -z "${QMAKE_PROFILES}" ]; then | 60 | if [ -z "${QMAKE_PROFILES}" ]; then |
61 | PROFILES="`ls *.pro`" | 61 | PROFILES="`ls *.pro`" |
@@ -70,15 +70,15 @@ qmake_base_do_configure() { | |||
70 | if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then | 70 | if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then |
71 | AFTER="-after" | 71 | AFTER="-after" |
72 | QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" | 72 | QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" |
73 | oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" | 73 | bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" |
74 | fi | 74 | fi |
75 | 75 | ||
76 | if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then | 76 | if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then |
77 | QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" | 77 | QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" |
78 | oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" | 78 | bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" |
79 | fi | 79 | fi |
80 | 80 | ||
81 | #oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" | 81 | #bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" |
82 | unset QMAKESPEC || true | 82 | unset QMAKESPEC || true |
83 | ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" | 83 | ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" |
84 | } | 84 | } |