4 files changed, 98 insertions, 3 deletions

diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc
index fac77d5..b3c2dbf 100644
--- a/recipes-qt3/qt3/qt-x11-free-common.inc
+++ b/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -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 \
diff --git a/recipes-qt3/qt3/qt-x11-free-native/qmake.conf b/recipes-qt3/qt3/qt-x11-free-native/qmake.conf
new file mode 100644
index 0000000..f0c71bf
--- /dev/null
+++ b/recipes-qt3/qt3/qt-x11-free-native/qmake.conf
@@ -0,0 +1,90 @@
+#
+# $Id: qt/qmake.conf   3.3.5   edited Oct 31 2003 $
+#
+# qmake configuration for linux-g++
+# Customised version for meta-qt3
+
+MAKEFILE_GENERATOR      = UNIX
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC                = gcc
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          = 
+QMAKE_YACC              = yacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
+QMAKE_CFLAGS            = -pipe
+QMAKE_CFLAGS_DEPS       = -M
+QMAKE_CFLAGS_WARN_ON    = -Wall -W
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLIB      = -fPIC
+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD     = -D_REENTRANT
+
+QMAKE_CXX               = g++
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        =
+QMAKE_LIBDIR_X11        =
+QMAKE_INCDIR_QT         = $(QTDIR)/include
+QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+QMAKE_INCDIR_OPENGL     =
+QMAKE_LIBDIR_OPENGL     =
+
+QMAKE_LINK              = g++
+QMAKE_LINK_SHLIB        = g++
+QMAKE_LFLAGS            =
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             =
+
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11          = -lXext -lX11 -lm
+QMAKE_LIBS_X11SM        = -lSM -lICE
+QMAKE_LIBS_NIS          = -lnsl
+QMAKE_LIBS_QT           = -lqt
+QMAKE_LIBS_QT_THREAD    = -lqt-mt
+QMAKE_LIBS_OPENGL       = -lGLU -lGL -lXmu
+QMAKE_LIBS_OPENGL_QT    = -lGL -lXmu
+QMAKE_LIBS_THREAD       = -lpthread
+
+QMAKE_MOC               = $(QTDIR)/bin/moc
+QMAKE_UIC               = $(QTDIR)/bin/uic
+
+QMAKE_AR                = ar cqs
+QMAKE_RANLIB            =
+
+QMAKE_TAR               = tar -cf
+QMAKE_GZIP              = gzip -9f
+
+QMAKE_COPY              = cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
+QMAKE_MOVE              = mv -f
+QMAKE_DEL_FILE          = rm -f
+QMAKE_DEL_DIR           = rmdir
+QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB    += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS    = test -d
+QMAKE_MKDIR             = mkdir -p
diff --git a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
index d70c373..f80345b 100644
--- a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
+++ b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
@@ -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}/
diff --git a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
index cf3b878..a67dd63 100644
--- a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
+++ b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -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"