sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qtbase: remove some dead code

This commit is contained in:
Martin Jansa 2013-04-28 13:08:27 +02:00
parent 3a91c4dc3d
commit 54a6379be4
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-qt/qt5/qtbase-native.inc
View File

@ -30,7 +30,6 @@ QT_CONF_PATH = "${B}/qt.conf"
do_generate_qt_config_file() { do_generate_qt_config_file() {
: :
# echo >> ${WORKDIR}/qt.conf
} }
EXTRA_OECONF = " \ EXTRA_OECONF = " \

3
recipes-qt/qt5/qtbase.inc
View File

@ -33,12 +33,10 @@ ARM_INSTRUCTION_SET = "arm"
inherit qmake5 inherit qmake5
do_generate_qt_config_file_append() { do_generate_qt_config_file_append() {
UNDO_SYSROOT_PREFIX=`echo ${STAGING_DIR_TARGET} | sed 's#/[^/]*#../#g'`
cat >> ${WORKDIR}/qt.conf <<EOF cat >> ${WORKDIR}/qt.conf <<EOF
[EffectivePaths] [EffectivePaths]
Prefix=.. Prefix=..
#Prefix=$UNDO_SYSROOT_PREFIX
EOF EOF
} }
@ -49,7 +47,6 @@ EXTRA_ENV = 'QMAKE="bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} -after \
MAKE="make -e ${PARALLEL_MAKE}"' MAKE="make -e ${PARALLEL_MAKE}"'
# qtbase is exception, we need to use mkspecs from ${S} # qtbase is exception, we need to use mkspecs from ${S}
# QMAKE_MKSPEC_PATH = "${S}/mkspecs"
QMAKE_MKSPEC_PATH = "${B}" QMAKE_MKSPEC_PATH = "${B}"
do_configure_append() { do_configure_append() {