Fix QA errors

The following changes since commit 13df95beabc0c4ae374b245ce195174e64004a5d:

qt-x11-free-common: Add version to LICENSE fields (2012-03-13 23:50:06 +0000)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/qt3-qa
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/qt3-qa

Paul Eggleton (1):
qt-x11-free: fix QA errors

 recipes-qt3/qt3/qt-x11-free-common.inc        |    3 +
 recipes-qt3/qt3/qt-x11-free-native/qmake.conf |   90 +++++++++++++++++++++++++
 recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb   |    6 +-
 recipes-qt3/qt3/qt-x11-free_3.3.7.bb          |    2 +-
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 recipes-qt3/qt3/qt-x11-free-native/qmake.conf

1.7.5.4

Fix the following QA errors when building qt-x11-free:

WARNING: For recipe qt-x11-free, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/qt3/plugins/sqldrivers
WARNING: qt-x11-free: The compile log indicates that host include and/or library paths were used. Please check the log '${WORKDIR}/temp/log.do_compile' for more information.
WARNING: QA Issue: package libqt-mt3 contains bad RPATH ${WORKDIR}/qt-x11-free-3.3.7/lib in file ${WORKDIR}/packages-split/libqt-mt3/usr/lib/libqt-mt.so.3.3.7
WARNING: QA Issue: package libqt-mt3 contains bad RPATH ${WORKDIR}/qt-x11-free-3.3.7/lib in file ${WORKDIR}/packages-split/libqt-mt3/usr/lib/libqt-mt.so.3
WARNING: QA Issue: package qt-x11-plugins-imageformats contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/imageformats in file ${WORKDIR}/packages-split/qt-x11-plugins-imageformats/usr/lib/qt3/plugins/imageformats/libqjpeg.so
WARNING: QA Issue: package qt-x11-plugins-imageformats contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/imageformats in file ${WORKDIR}/packages-split/qt-x11-plugins-imageformats/usr/lib/qt3/plugins/imageformats/libqmng.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/libcppeditor.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/librcplugin.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/libwizards.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/libkdevdlgplugin.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/libdlgplugin.so
WARNING: QA Issue: package qt-x11-plugins-designer contains bad RPATH /usr/lib:${WORKDIR}/qt-x11-free-3.3.7/plugins/designer in file ${WORKDIR}/packages-split/qt-x11-plugins-designer/usr/lib/qt3/plugins/designer/libgladeplugin.so

This required installing a custom qmake.conf (as we do with Qt4 in OE-Core) in qt-x11-free-native as well as removing the sql driver plugin directory if it is empty (which it will be unless the appropriate flags are added to enable the SQL driver plugins, which default to disabled even if the appropriate libraries are installed).

---
 recipes-qt3/qt3/qt-x11-free-common.inc        |    3 +
 recipes-qt3/qt3/qt-x11-free-native/qmake.conf |   90 +++++++++++++++++++++++++
 recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb   |    6 +-
 recipes-qt3/qt3/qt-x11-free_3.3.7.bb          |    2 +-
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 recipes-qt3/qt3/qt-x11-free-native/qmake.conf

index fac77d5..b3c2dbf 100644
@@ -73,6 +73,9 @@ do_install() {
 	oe_libinstall -so -C lib libqt-mt ${D}${libdir}
 	install -d ${D}${libdir}/qt3/plugins/
 	cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${libdir}/qt3/plugins/
+
+	# Avoid empty directory QA error
+	rmdir ${D}${libdir}/qt3/plugins/sqldrivers 2>/dev/null || true
 }
 
 PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \

index d70c373..f80345b 100644
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "GPL | QPL"
 DEPENDS = "xmu-native"
 HOMEPAGE = "http://www.trolltech.com"
-PR = "r3"
+PR = "r4"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
 

@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
            file://no-examples.patch \
-           file://qt3-cstddef.patch"
+           file://qt3-cstddef.patch \
+           file://qmake.conf"
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
 #

@@ -55,6 +56,7 @@ do_install() {
  
     install -d ${D}${datadir}/qt3/
     cp -PfR mkspecs ${D}${datadir}/qt3/
+    install -m 0644 ${WORKDIR}/qmake.conf ${D}${datadir}/qt3/mkspecs/linux-g++/
     ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${TARGET_OS}-oe-g++
     ln -sf qt3/mkspecs ${D}${datadir}/qmake
     install -d ${D}${libdir}/

index cf3b878..a67dd63 100644
@@ -1,6 +1,6 @@
 DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor  virtual/libgl"
 PROVIDES = "qt3x11"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
                     file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"

1.7.5.4

Merged to meta-qt3 master, thanks.

Richard