From d4dab10d0b2e770be63348e9ff58b9ba195d1b5c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Jun 2009 10:43:24 +0200 Subject: Fix Qtopia build with external toolchain The fixes made to qmake.conf for the cross-compiling tools were not sufficient in the case of an external toolchain, since the CFLAGS were not taken into account. And the --sysroot option contained in the CFLAGS are very important for external toolchains to work. Additionally, it makes sure that Qtopia is compiled with the proper CFLAGS, even if an external toolchain isn't used. --- package/qtopia4/qtopia4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index a198a41bd..fb027dcee 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -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'. -- cgit v1.2.3 From 1bbceff78a123a3f1e0422f17be12e7ffd28f803 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 3 Jul 2009 10:25:39 +0200 Subject: Bump Qtopia version to 4.5.2 --- package/qtopia4/qtopia4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index fb027dcee..0f5f150eb 100644 --- a/package/qtopia4/qtopia4.mk +++ b/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))) -- cgit v1.2.3 From a1125b31af64bb3fbe40b7db2be0e70f4c2471bb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 3 Jul 2009 10:44:10 +0200 Subject: New build fix for Qtopia4 The new patch fixes the build failure when BR2_PACKAGE_QTOPIA4_QTZLIB=y. --- package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch diff --git a/package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch b/package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch new file mode 100644 index 000000000..b191cc751 --- /dev/null +++ b/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 ++} -- cgit v1.2.3