Merge branch 'qtopia-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch

@@ -0,0 +1,20 @@
+When QT is compiled in qt-zlib mode, compilation of
+src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not
+found. The following patch adds the internal QT zlib directory to the
+include path to fix this issue.
+
+---
+ src/gui/painting/painting.pri |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.2.orig/src/gui/painting/painting.pri
++++ qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
+@@ -367,3 +367,6 @@
+         SOURCES += painting/qwindowsurface_d3d.cpp
+ }
+ 
++contains(QT_CONFIG, zlib) {
++   INCLUDEPATH += ../3rdparty/zlib
++}

package/qtopia4/qtopia4.mk

@@ -21,7 +21,7 @@
 # x86 crosscompiling under linux x86. Please remove it when the workaround
 # is no longer necessary.
 
-QTOPIA4_VERSION:=4.5.1
+QTOPIA4_VERSION:=4.5.2
 QTOPIA4_CAT:=$(BZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@@ -440,6 +440,8 @@ endif
 	$(call QTOPIA4_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY))
 	$(call QTOPIA4_QMAKE_SET,RANLIB,$(TARGET_RANLIB))
 	$(call QTOPIA4_QMAKE_SET,STRIP,$(TARGET_STRIP))
+	$(call QTOPIA4_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS))
+	$(call QTOPIA4_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS))
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 # Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.