merge of 'a4a93e205d5a389011745cf24cb1a68fbc0ed7e7'

     and 'b271566db667a7d227532eeb896b9f11d7e009c9'

diff --cc packages/qt/qt4-x11-free_4.3.0.bb
index da9817d,2e8b96c..035efa9
--- 1/packages/qt/qt4-x11-free_4.3.0.bb
--- 2/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.0.bb
@@@ -3,9 -3,9 +3,10 @@@ PRIORITY = "optional
  HOMEPAGE = "http://www.trolltech.com"
  LICENSE = "GPL QPL"
  DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus"
 +RDEPENDS_${PN} = "${QTPACKAGES}"
  PROVIDES = "qt4x11"
- PR = "r1"
+ 
+ PR = "r2"
  
  SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
             file://0001-cross-compile.patch;patch=1 \
@@@ -132,20 -129,34 +130,33 @@@ PACKAGES += "${QTPACKAGES}
  
  ALLOW_EMPTY = "1"
  FILES_${PN} = ""
 -RDEPENDS_${PN} = "${QTPACKAGES}"
  
- FILES_libqtcore4               = "${libdir}/libQtCore.so.*"
- FILES_libqtgui4                = "${libdir}/libQtGui.so.*"
- FILES_libqtnetwork4            = "${libdir}/libQtNetwork.so.*"
- FILES_libqtsql4                = "${libdir}/libQtSql.so.*"
- FILES_libqtsvg4                = "${libdir}/libQtSvg.so.*"
- FILES_libqttest4               = "${libdir}/libQtTest.so.*"
- FILES_libqtxml4                = "${libdir}/libQtXml.so.*"
- FILES_libqtdesigner4           = "${libdir}/libQtDesigner.so.*"
- FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so.*"
- FILES_libqt3support4           = "${libdir}/libQt3Support.so.*"
- FILES_libqtassistantclient4    = "${libdir}/libQtAssistantClient.so.*"
- FILES_libqtscript4           = "${libdir}/libQtScript.so.*"
- FILES_libqtdbus4             = "${libdir}/libQtDBus.so.*"
+ FILES_libqtcore4                   = "${libdir}/libQtCore.so.*"
+ FILES_libqtcore4-dev               = "${libdir}/libQtCore.so"
+ FILES_libqtgui4                    = "${libdir}/libQtGui.so.*"
+ FILES_libqtgui4-dev                = "${libdir}/libQtGui.so"
+ FILES_libqtnetwork4                = "${libdir}/libQtNetwork.so.*"
+ FILES_libqtnetwork4-dev            = "${libdir}/libQtNetwork.so"
+ FILES_libqtsql4                    = "${libdir}/libQtSql.so.*"
+ FILES_libqtsql4-dev                = "${libdir}/libQtSql.so"
+ FILES_libqtsvg4                    = "${libdir}/libQtSvg.so.*"
+ FILES_libqtsvg4-dev                = "${libdir}/libQtSvg.so"
+ FILES_libqttest4                   = "${libdir}/libQtTest.so.*"
+ FILES_libqttest4-dev               = "${libdir}/libQtTest.so"
+ FILES_libqtxml4                    = "${libdir}/libQtXml.so.*"
+ FILES_libqtxml4-dev                = "${libdir}/libQtXml.so"
+ FILES_libqtdesigner4               = "${libdir}/libQtDesigner.so.*"
+ FILES_libqtdesigner4-dev           = "${libdir}/libQtDesigner.so"
+ FILES_libqtdesignercomponents4     = "${libdir}/libQtDesignerComponents.so.*"
+ FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so"
+ FILES_libqt3support4               = "${libdir}/libQt3Support.so.*"
+ FILES_libqt3support4-dev           = "${libdir}/libQt3Support.so"
+ FILES_libqtassistantclient4        = "${libdir}/libQtAssistantClient.so.*"
+ FILES_libqtassistantclient4-dev    = "${libdir}/libQtAssistantClient.so"
+ FILES_libqtscript4               = "${libdir}/libQtScript.so.*"
+ FILES_libqtscript4-dev                   = "${libdir}/libQtScript.so"
+ FILES_libqtdbus4                 = "${libdir}/libQtDBus.so.*"
+ FILES_libqtdbus4-dev             = "${libdir}/libQtDBus.so"
  
  FILES_qt4-plugins-accessible   = "${libdir}/plugins/accessible/*.so"
  FILES_qt4-plugins-codecs       = "${libdir}/plugins/codecs/*.so"