1 files changed, 10 insertions, 28 deletions

diff --git a/recipes-qt/qt4/qt-4.7.1.inc b/recipes-qt/qt4/qt-4.7.1.inc
index 682707ad7..70ee59697 100644
--- a/recipes-qt/qt4/qt-4.7.1.inc
+++ b/recipes-qt/qt4/qt-4.7.1.inc
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 LICENSE = "LGPLv2.1 | GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
@@ -7,17 +5,17 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 
 FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
 
-SRC_URI = "\
-        ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-        file://0004-no-qmake.patch \
-    file://hack-out-pg2-4.7.0.patch \
-        file://0006-freetype-host-includes.patch \
-        file://0001-Added-Openembedded-crossarch-option.patch \
-        file://g++.conf \
-        file://linux.conf \
+SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://0004-no-qmake.patch \
+           file://hack-out-pg2-4.7.0.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0001-Added-Openembedded-crossarch-option.patch \
+           file://g++.conf \
+           file://linux.conf \
            "
-# Set necessary variables in the profile
-SRC_URI += "file://qte.sh"
+
+SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
+SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
@@ -58,19 +56,3 @@ do_compile() {
 
     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
-}
-
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
-