qmake2: update qt from 4.4.3 to 4.7.3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 9 insertions, 5 deletions

diff --git a/meta-oe/recipes-qt/qt4/qmake2.inc b/meta-oe/recipes-qt/qt4/qmake2.inc
index f2631b5f7..d38e83ef2 100644
--- a/meta-oe/recipes-qt/qt4/qmake2.inc
+++ b/meta-oe/recipes-qt/qt4/qmake2.inc
@@ -2,15 +2,18 @@ DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
-LICENSE = "GPL"
+LICENSE = "LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+                    file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 PR = "r12"
 
 # We call 'moc' during the build 
 DEPENDS = "qt4-tools-native"
 
-QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}"
+QTVER = "qt-everywhere-opensource-src-${QTVERSION}"
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \
+SRC_URI = "http://get.qt.nokia.com/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch \
            file://qt-config.patch \
            file://use-lflags-last.patch \
@@ -34,9 +37,10 @@ do_configure() {
     # Make sure we regenerate all Makefiles 
     find ${S} -name "Makefile" | xargs rm
     # Install the OE build templates
-    for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++
+    for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ default
     do
         install -d ${S}/mkspecs/$template
+                rm -f ${S}/mkspecs/$template/qmake.conf
         install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
         ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
     done
@@ -59,7 +63,7 @@ do_configure() {
     export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
     export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
     export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-    echo yes | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+    (echo o; echo yes) | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {