summaryrefslogtreecommitdiff
path: root/package/qt/qt-4.5.2-fix-qt-zlib-build.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-25 00:05:35 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-25 00:05:35 +0200
commit20d2c70fbda47a6a2eb571da33a9526a0b8c7a1b (patch)
treeee60b1f6d86633c8bf07f38b8819df302384c243 /package/qt/qt-4.5.2-fix-qt-zlib-build.patch
parentf917e6b21b262b6fb7ff363f6c7b217bb653d97c (diff)
qt: rename qtopia4 to qt
A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt/qt-4.5.2-fix-qt-zlib-build.patch')
-rw-r--r--package/qt/qt-4.5.2-fix-qt-zlib-build.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/qt/qt-4.5.2-fix-qt-zlib-build.patch b/package/qt/qt-4.5.2-fix-qt-zlib-build.patch
new file mode 100644
index 000000000..b191cc751
--- /dev/null
+++ b/package/qt/qt-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
++}