From 0ff97f9e6a959216c164d728cad7962a2a2909e2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 12 Dec 2012 06:29:34 +0100
Subject: [PATCH] qtdeclarative: use common qt5.inc, fix invalid PACKAGES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtdeclarative.inc | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index b36b46adf2..db944be647 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -1,3 +1,5 @@
+require qt5.inc
+
 # FIXME!!!
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
@@ -6,8 +8,6 @@ DEPENDS = "qtbase qtjsbackend"
 
 INC_PR = "r0"
 
-QT_MODULE = "${PN}"
-
 inherit qmake5
 
 SRC_URI += " \
@@ -31,18 +31,8 @@ do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 }
 
-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/*"
 
-PACKAGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg"
+PACKAGES .= "${PN}-qmlplugins ${PN}-qmltooling ${PN}-qmltooling-dbg"