diff options
Diffstat (limited to 'classes/qmake5_base.bbclass')
-rw-r--r-- | classes/qmake5_base.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 50e5a306..df8f6246 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -41,8 +41,9 @@ export OE_QMAKE_LDFLAGS = "${LDFLAGS}" | |||
41 | export OE_QMAKE_AR = "${AR}" | 41 | export OE_QMAKE_AR = "${AR}" |
42 | export OE_QMAKE_STRIP = "echo" | 42 | export OE_QMAKE_STRIP = "echo" |
43 | export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" | 43 | export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" |
44 | OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" | 44 | |
45 | export OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" | 45 | # qmake reads if from shell environment |
46 | export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" | ||
46 | 47 | ||
47 | inherit qmake5_paths remove-libtool | 48 | inherit qmake5_paths remove-libtool |
48 | 49 | ||
@@ -170,8 +171,8 @@ qmake5_base_do_configure () { | |||
170 | # for config.tests to read this | 171 | # for config.tests to read this |
171 | export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" | 172 | export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" |
172 | 173 | ||
173 | CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE" | 174 | CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE" |
174 | ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD" | 175 | ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD" |
175 | } | 176 | } |
176 | 177 | ||
177 | qmake5_base_native_do_install() { | 178 | qmake5_base_native_do_install() { |