1 files changed, 7 insertions, 25 deletions

diff --git a/recipes-qt/qt4/qt4-embedded.inc b/recipes-qt/qt4/qt4-embedded.inc
index 932f005d2..2ed1819f6 100644
--- a/recipes-qt/qt4/qt4-embedded.inc
+++ b/recipes-qt/qt4/qt4-embedded.inc
@@ -1,37 +1,19 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-DESCRIPTION = "${SUMMARY}"
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
 SECTION = "libs"
-LICENSE = "GPL QPL"
+LICENSE = "LGPLv2.1 | GPLv3"
 PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
+HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r25"
+INC_PR = "r26"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX = "E"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://0001-cross-compile.patch \
-           file://0002-fix-resinit-declaration.patch \
-           file://0003-no-tools.patch \
-           file://0004-no-qmake.patch \
-           file://0006-freetype-host-includes.patch \
-           file://0007-openssl-host-includes.patch \
-           file://0008-qt-lib-infix.patch \
-           file://0009-support-2bpp.patch \
-           file://fix-config-tests.patch \
-           file://g++.conf \
-           file://linux.conf \
-           "
 
 # Set necessary variables in the profile
 SRC_URI += "file://qte.sh"
 
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
 QT_CONFIG_FLAGS += " \
+    -embedded ${QT_ARCH} \
     -qtlibinfix ${QT_LIBINFIX} \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
@@ -42,8 +24,8 @@ QT_CONFIG_FLAGS += " \
 require qt4.inc
 
 do_install_append() {
-        install -d ${D}${sysconfdir}/profile.d/
-        install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
+    install -d ${D}${sysconfdir}/profile.d/
+    install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
 }
 
 FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"