Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0701

Conflicts:
	recipes/qt4/qt-4.7.1.inc

diff --cc recipes/qt4/qt-4.7.1.inc
index 0000000,20313e8..ce6b925
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/qt4/qt-4.7.1.inc
+++ b/recipes/qt4/qt-4.7.1.inc
@@@ -1,0 -1,73 +1,74 @@@
+ DEFAULT_PREFERENCE = "-1"
+ DEFAULT_PREFERENCE_opendreambox = "1"
++DEFAULT_PREFERENCE_vuplus = "1"
+ LICENSE = "LGPLv2.1 GPLv3"
+ 
+ FILESPATHPKG =. "qt-${PV}:"
+ 
+ SRC_URI = "\
+       ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+       file://blacklist-fraudulent-comodo-certificates-patch.diff;patch=1 \
+       file://0004-no-qmake.patch;patch=1 \
+       file://hack-out-pg2-4.7.0.patch;patch=1 \
+       file://0006-freetype-host-includes.patch;patch=1 \
+       file://0001-Added-Openembedded-crossarch-option.patch;patch=1 \
+       file://0010-phonon-gstreamer-rgb-endianess.patch;patch=1 \
+       file://webkit_r82142.patch;patch=1 \
+       file://g++.conf \
+       file://linux.conf \
+            "
+ # Set necessary variables in the profile
+ SRC_URI += "file://qte.sh"
+ 
+ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+ 
+ FILES_${QT_BASE_NAME}-tools                += "${bindir}/qml"
+ 
+ do_configure_prepend() {
+     for pro in $(find ${S} -name "*.pro") ; do
+         sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+     done
+ 
+     sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+     sed -i \
+     -e /QMAKE_MOC\ /d \
+     -e /QMAKE_UIC\ /d \
+     -e /QMAKE_UIC3\ /d \
+     -e /QMAKE_RCC\ /d \
+     ${S}/configure
+ }
+ 
+ do_configure_append() {
+     sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+ }
+ 
+ QT_GLFLAGS ?= ""
+ QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+ 
+ do_compile() {
+     # Fixup missing wsegl header in some SGX SDKs
+     if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+         cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+     fi
+ 
+     unset CFLAGS CXXFLAGS
+     install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+     install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+     install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+     install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
+ 
+     oe_runmake ${EXTRA_ENV}
+ }
+ 
+ do_install_append() {
+       install -d ${D}${bindir}
+       for i in rcc uic moc ; do
+               install -m 0755 ${S}/bin/$i ${D}${bindir}/
+       done
+ 
+         #Append an E to the qtdemo file
+         if [ -n "${QT_LIBINFIX}" ] ; then
+                 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+         fi
+ }
+ 

diff --cc recipes/qt4/qt4-tools-native_4.7.1.bb
index 0000000,2e0953a..8df7640
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/qt4/qt4-tools-native_4.7.1.bb
+++ b/recipes/qt4/qt4-tools-native_4.7.1.bb
@@@ -1,0 -1,19 +1,20 @@@
+ DEFAULT_PREFERENCE = "-1"
+ DEFAULT_PREFERENCE_opendreambox = "1"
++DEFAULT_PREFERENCE_vuplus = "1"
+ 
+ require qt4-tools-native.inc
+ LICENSE = "LGPLv2.1 GPLv3"
+ 
+ PR = "${INC_PR}.0"
+ 
+ # Find the g++.conf/linux.conf in the right directory.
+ FILESPATHPKG =. "qt-${PV}:"
+ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+            file://qt-config.patch;patch=1 \
+            file://g++.conf \
+            file://linux.conf"
+ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+ 
+ EXTRA_OECONF += " -no-fast -silent -no-rpath"
+ 
+ TOBUILD := "src/tools/bootstrap ${TOBUILD}"