jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Korsgaard 2009-07-03 13:20:35 +02:00
commit ddd0db77ab
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch Normal file
View File

@ -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
+}

4
package/qtopia4/qtopia4.mk
View File

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