diff options
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 764e010e..8755e810 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -30,7 +30,6 @@ QT_CONF_PATH = "${B}/qt.conf" | |||
30 | 30 | ||
31 | do_generate_qt_config_file() { | 31 | do_generate_qt_config_file() { |
32 | : | 32 | : |
33 | # echo >> ${WORKDIR}/qt.conf | ||
34 | } | 33 | } |
35 | 34 | ||
36 | EXTRA_OECONF = " \ | 35 | EXTRA_OECONF = " \ |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f348c19d..b3791ed6 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -33,12 +33,10 @@ ARM_INSTRUCTION_SET = "arm" | |||
33 | inherit qmake5 | 33 | inherit qmake5 |
34 | 34 | ||
35 | do_generate_qt_config_file_append() { | 35 | do_generate_qt_config_file_append() { |
36 | UNDO_SYSROOT_PREFIX=`echo ${STAGING_DIR_TARGET} | sed 's#/[^/]*#../#g'` | ||
37 | cat >> ${WORKDIR}/qt.conf <<EOF | 36 | cat >> ${WORKDIR}/qt.conf <<EOF |
38 | 37 | ||
39 | [EffectivePaths] | 38 | [EffectivePaths] |
40 | Prefix=.. | 39 | Prefix=.. |
41 | #Prefix=$UNDO_SYSROOT_PREFIX | ||
42 | EOF | 40 | EOF |
43 | } | 41 | } |
44 | 42 | ||
@@ -49,7 +47,6 @@ EXTRA_ENV = 'QMAKE="bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} -after \ | |||
49 | MAKE="make -e ${PARALLEL_MAKE}"' | 47 | MAKE="make -e ${PARALLEL_MAKE}"' |
50 | 48 | ||
51 | # qtbase is exception, we need to use mkspecs from ${S} | 49 | # qtbase is exception, we need to use mkspecs from ${S} |
52 | # QMAKE_MKSPEC_PATH = "${S}/mkspecs" | ||
53 | QMAKE_MKSPEC_PATH = "${B}" | 50 | QMAKE_MKSPEC_PATH = "${B}" |
54 | 51 | ||
55 | do_configure_append() { | 52 | do_configure_append() { |