qt4: add 4.6.2

* fix 4.6.1 references in 4.6.0 files as well
* make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking

21 files changed, 36 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 52c1274a55..72b015b5c9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23766,6 +23766,10 @@ sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 md5=0542a4be6425451ab5f668c6899cac36
 sha256=4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
 
+[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.2.tar.gz]
+md5=eb651ee4b157c01696aa56777fc6e0e5
+sha256=176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
diff --git a/recipes/qt4/files/qt-config.patch b/recipes/qt4/files/qt-config.patch
index 3aa041aa51..a4a701ccd7 100644
--- a/recipes/qt4/files/qt-config.patch
+++ b/recipes/qt4/files/qt-config.patch
@@ -14,7 +14,7 @@
          qtconfig = qmake_libraryInfoFile();
 +    if (!QFile::exists(qtconfig)) {
 +        QByteArray config = getenv("QT_CONF_PATH");
-+        qtconfig = config;
++        qtconfig = QFile::decodeName(config);
 +    }
  #else
      if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
diff --git a/recipes/qt4/qt-4.6.1.inc b/recipes/qt4/qt-4.6.2.inc
index 274deea426..94777e5d04 100644
--- a/recipes/qt4/qt-4.6.1.inc
+++ b/recipes/qt4/qt-4.6.2.inc
@@ -18,6 +18,10 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
 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 \
@@ -27,8 +31,12 @@ do_configure_prepend() {
     ${S}/configure
 }
 
+do_configure_append() {
+    sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}
+
 QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += "${QT_GLFLAGS}"
+QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
 
 do_compile() {
     unset CFLAGS CXXFLAGS
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.6.2/0006-freetype-host-includes.patch
index 987c425138..987c425138 100644
--- a/recipes/qt4/qt4-embedded-4.6.1/0006-freetype-host-includes.patch
+++ b/recipes/qt4/qt4-embedded-4.6.2/0006-freetype-host-includes.patch
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.6.2/0008-qt-lib-infix.patch
index 61e60a0eb6..61e60a0eb6 100644
--- a/recipes/qt4/qt4-embedded-4.6.1/0008-qt-lib-infix.patch
+++ b/recipes/qt4/qt4-embedded-4.6.2/0008-qt-lib-infix.patch
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.2/0010-no-simpledecoration-example.patch
index fce5bba938..fce5bba938 100644
--- a/recipes/qt4/qt4-embedded-4.6.1/0010-no-simpledecoration-example.patch
+++ b/recipes/qt4/qt4-embedded-4.6.2/0010-no-simpledecoration-example.patch
diff --git a/recipes/qt4/qt4-embedded-4.6.1/linux.conf b/recipes/qt4/qt4-embedded-4.6.2/linux.conf
index 68ae80b929..68ae80b929 100644
--- a/recipes/qt4/qt4-embedded-4.6.1/linux.conf
+++ b/recipes/qt4/qt4-embedded-4.6.2/linux.conf
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index 7aadafe6a0..915dd0734f 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.1"
 PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.1.inc
+require qt-4.6.0.inc
 
 
 FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.1.bb b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
index 915dd0734f..05faa538c5 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.1.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.1"
 PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.0.inc
+require qt-${PV}.inc
 
 
 FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb
index f2c8410c55..58fda71ad1 100644
--- a/recipes/qt4/qt4-embedded_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded_4.6.0.bb
@@ -2,5 +2,5 @@ require qt4-embedded.inc
 
 PR = "${INC_PR}.0"
 
-require qt-4.6.1.inc
+require qt-4.6.0.inc
 
diff --git a/recipes/qt4/qt4-embedded_4.6.1.bb b/recipes/qt4/qt4-embedded_4.6.2.bb
index f2c8410c55..94ecd01bc6 100644
--- a/recipes/qt4/qt4-embedded_4.6.1.bb
+++ b/recipes/qt4/qt4-embedded_4.6.2.bb
@@ -2,5 +2,5 @@ require qt4-embedded.inc
 
 PR = "${INC_PR}.0"
 
-require qt-4.6.1.inc
+require qt-${PV}.inc
 
diff --git a/recipes/qt4/qt4-tools-native_4.6.1.bb b/recipes/qt4/qt4-tools-native_4.6.2.bb
index 48310b1233..d9ab033b58 100644
--- a/recipes/qt4/qt4-tools-native_4.6.1.bb
+++ b/recipes/qt4/qt4-tools-native_4.6.2.bb
@@ -12,4 +12,15 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
+EXTRA_OECONF = "-prefix ${prefix} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng \
+                -no-accessibility \
+                -no-cups \
+                -no-exceptions  \
+                -no-nas-sound \
+                -no-nis \
+                -verbose -release -no-fast -static \
+                -qt3support -silent -no-rpath"
+
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-sdk_4.6.1.bb b/recipes/qt4/qt4-tools-sdk_4.6.2.bb
index b74b8a27e0..b74b8a27e0 100644
--- a/recipes/qt4/qt4-tools-sdk_4.6.1.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.2.bb
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch
index 61e60a0eb6..61e60a0eb6 100644
--- a/recipes/qt4/qt4-x11-free-4.6.1/0008-qt-lib-infix.patch
+++ b/recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-x11-free-4.6.2/0010-no-simpledecoration-example.patch
index fce5bba938..fce5bba938 100644
--- a/recipes/qt4/qt4-x11-free-4.6.1/0010-no-simpledecoration-example.patch
+++ b/recipes/qt4/qt4-x11-free-4.6.2/0010-no-simpledecoration-example.patch
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/linux.conf b/recipes/qt4/qt4-x11-free-4.6.2/linux.conf
index 68ae80b929..68ae80b929 100644
--- a/recipes/qt4/qt4-x11-free-4.6.1/linux.conf
+++ b/recipes/qt4/qt4-x11-free-4.6.2/linux.conf
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
index c25f9050fe..8d09d89f8d 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.3"
 
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.1.inc
+require qt-4.6.0.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.1.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
index 8d09d89f8d..0f9140cc03 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.1.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.3"
 
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.0.inc
+require qt-${PV}.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb
index c2d8f669cf..685b7add57 100644
--- a/recipes/qt4/qt4-x11-free_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free_4.6.0.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 PR = "${INC_PR}.1"
 
-require qt-4.6.1.inc
+require qt-4.6.0.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4-x11-free_4.6.1.bb b/recipes/qt4/qt4-x11-free_4.6.2.bb
index 685b7add57..a8d5c3f141 100644
--- a/recipes/qt4/qt4-x11-free_4.6.1.bb
+++ b/recipes/qt4/qt4-x11-free_4.6.2.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 PR = "${INC_PR}.1"
 
-require qt-4.6.0.inc
+require qt-${PV}.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 62fcec11a2..c98a0557e5 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -96,7 +96,7 @@ RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
 RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
 RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
 
-FILES_${QT_BASE_NAME}-tools                = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay"
+FILES_${QT_BASE_NAME}-tools                = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*"
 FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
 FILES_${QT_BASE_NAME}-assistant-dbg        = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
 FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
@@ -164,9 +164,9 @@ do_configure() {
             -demosdir ${bindir}/${QT_DIR_NAME}/demos \
             -platform ${TARGET_OS}-oe-g++ \
             -xplatform ${TARGET_OS}-oe-g++ \
-            -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
+            -embedded ${QT_ARCH} ${QT_ENDIAN} \
             -crossarch ${QT_ARCH} \
-            ${QT_CONFIG_FLAGS} -fast \
+            ${QT_CONFIG_FLAGS} -no-fast \
             -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
             -I${STAGING_INCDIR}/freetype2 \
             -I${STAGING_INCDIR}/mysql \