From 9f3d14a2fca85f99f2b7bb881e4be736fe266685 Mon Sep 17 00:00:00 2001
From: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Date: Sun, 9 Dec 2012 13:56:34 -0800
Subject: [PATCH] qtdeclarative: packaging update and recipe cleanup

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
---
 recipes-qt/qt5/qtdeclarative.inc          | 22 ++++++++++++++--------
 recipes-qt/qt5/qtdeclarative_4.999+git.bb |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index aaada23e8c..bf904753cb 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -11,10 +11,6 @@ SRC_URI += " \
     file://module_qmake.conf \
     "
 
-# Bitbake will not respect the make order set by qmake and at times it will try to compile
-# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
-#PARALLEL_MAKE = ""
-
 export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
 do_configure () {
@@ -25,15 +21,25 @@ do_configure () {
     # of an error on the native recipe...
     cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf
 
-    ${OE_QMAKE_QMAKE} -d
+    ${OE_QMAKE_QMAKE} -r -d
 }
 
 do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 }
 
-FILES_${PN}-dev += "\
-        ${STAGING_INCDIR}/qt5 \
-        ${STAGING_DATADIR}/qt5 \
+FILES_${PN}-dev = "\
+        ${includedir}/qt5/* \
+        ${datadir}/qt5/mkspecs/* \
         ${libdir}/*.prl \
+        ${libdir}/cmake/* \
+        ${libdir}/pkgconfig/*.pc \
 "
+
+FILES_${PN}-staticdev = "${libdir}/*.la"
+FILES_${PN}-tools = "${bindir}/*"
+FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*"
+FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*"
+FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*"
+
+PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg"
\ No newline at end of file
diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb
index 456c2dab1a..8551d74c4c 100644
--- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb
+++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb
@@ -1,4 +1,4 @@
-SRCREV = "90ac5018823ab1109d084cbe0e9e63a4cd531faa"
+SRCREV = "425260c2b2a60c0c145a5e76a3b7835eadd0fd0d"
 SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git"
 S = "${WORKDIR}/git"